From 04b5465e950b1314e32c2e2032dfa69e74bb3001 Mon Sep 17 00:00:00 2001
From: Magic_RB <magic_rb@redalder.org>
Date: Sun, 2 May 2021 15:51:38 +0200
Subject: [PATCH] Gitea fixes

Signed-off-by: Magic_RB <magic_rb@redalder.org>
---
 infrastructure/gitea/app.ini.tpl | 17 ++++++++++-------
 infrastructure/gitea/nomad.hcl   |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/infrastructure/gitea/app.ini.tpl b/infrastructure/gitea/app.ini.tpl
index bf514de..9601737 100644
--- a/infrastructure/gitea/app.ini.tpl
+++ b/infrastructure/gitea/app.ini.tpl
@@ -24,16 +24,15 @@ SSH_LISTEN_PORT  = 22
 LFS_START_SERVER = true
 LFS_CONTENT_PATH = /data/gitea/git/lfs
 DOMAIN           = localhost
-LFS_JWT_SECRET   = {{ with secret "kv/gitea" }}{{ .Data.lfs_jwt_secret }}{{ end }}
+LFS_JWT_SECRET   = {{ with secret "kv/data/gitea" }}{{ .Data.data.lfs_jwt_secret }}{{ end }}
 OFFLINE_MODE     = false
 
 [database]
-PATH     = /data/gitea/gitea.db
 DB_TYPE  = mysql
 HOST     = {{ env "NOMAD_HOST_ADDR_db" }}
 NAME     = gitea
-USER     = {{ with secret "kv/gitea" }}{{ .Data.db_user }}{{ end }}
-PASSWD   = {{ with secret "kv/gitea" }}{{ .Data.db_passwd }}{{ end }}
+USER     = {{ with secret "kv/data/gitea" }}{{ .Data.data.db_user }}{{ end }}
+PASSWD   = {{ with secret "kv/data/gitea" }}{{ .Data.data.db_passwd }}{{ end }}
 SCHEMA   = 
 SSL_MODE = disable
 CHARSET  = utf8
@@ -57,8 +56,8 @@ PATH = /data/gitea/gitea/attachments
 
 [security]
 INSTALL_LOCK   = true
-SECRET_KEY     = {{ with secret "kv/gitea" }}{{ .Data.secret_key }}{{ end }}
-INTERNAL_TOKEN = {{ with secret "kv/gitea" }}{{ .Data.internal_token }}{{ end }}
+SECRET_KEY     = {{ with secret "kv/data/gitea" }}{{ .Data.data.secret_key }}{{ end }}
+INTERNAL_TOKEN = {{ with secret "kv/data/gitea" }}{{ .Data.data.internal_token }}{{ end }}
 
 [service]
 DISABLE_REGISTRATION              = false
@@ -73,7 +72,7 @@ DEFAULT_ENABLE_TIMETRACKING       = true
 NO_REPLY_ADDRESS                  = noreply.localhost
 
 [oauth2]
-JWT_SECRET = {{ with secret "kv/gitea" }}{{ .Data.jwt_secret }}{{ end }}
+JWT_SECRET = {{ with secret "kv/data/gitea" }}{{ .Data.data.jwt_secret }}{{ end }}
 
 [mailer]
 ENABLED = false
@@ -81,3 +80,7 @@ ENABLED = false
 [openid]
 ENABLE_OPENID_SIGNIN = true
 ENABLE_OPENID_SIGNUP = true
+
+[log]
+MODE = console
+LEVEL = Debug
diff --git a/infrastructure/gitea/nomad.hcl b/infrastructure/gitea/nomad.hcl
index d0960fd..eab8f02 100644
--- a/infrastructure/gitea/nomad.hcl
+++ b/infrastructure/gitea/nomad.hcl
@@ -54,7 +54,7 @@ job "gitea" {
       }
 
       config {
-	image = "gitea:local"
+	image = "magicrb/gitea:yc5q5q4q4zmih2rr1xjamnzxx7agjz55"
 
 	ports = ["http"]