Gitea fixes

Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2021-05-02 15:51:38 +02:00
parent dc01844998
commit 04b5465e95
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 11 additions and 8 deletions

View file

@ -24,16 +24,15 @@ SSH_LISTEN_PORT = 22
LFS_START_SERVER = true LFS_START_SERVER = true
LFS_CONTENT_PATH = /data/gitea/git/lfs LFS_CONTENT_PATH = /data/gitea/git/lfs
DOMAIN = localhost 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 OFFLINE_MODE = false
[database] [database]
PATH = /data/gitea/gitea.db
DB_TYPE = mysql DB_TYPE = mysql
HOST = {{ env "NOMAD_HOST_ADDR_db" }} HOST = {{ env "NOMAD_HOST_ADDR_db" }}
NAME = gitea NAME = gitea
USER = {{ with secret "kv/gitea" }}{{ .Data.db_user }}{{ end }} USER = {{ with secret "kv/data/gitea" }}{{ .Data.data.db_user }}{{ end }}
PASSWD = {{ with secret "kv/gitea" }}{{ .Data.db_passwd }}{{ end }} PASSWD = {{ with secret "kv/data/gitea" }}{{ .Data.data.db_passwd }}{{ end }}
SCHEMA = SCHEMA =
SSL_MODE = disable SSL_MODE = disable
CHARSET = utf8 CHARSET = utf8
@ -57,8 +56,8 @@ PATH = /data/gitea/gitea/attachments
[security] [security]
INSTALL_LOCK = true INSTALL_LOCK = true
SECRET_KEY = {{ with secret "kv/gitea" }}{{ .Data.secret_key }}{{ end }} SECRET_KEY = {{ with secret "kv/data/gitea" }}{{ .Data.data.secret_key }}{{ end }}
INTERNAL_TOKEN = {{ with secret "kv/gitea" }}{{ .Data.internal_token }}{{ end }} INTERNAL_TOKEN = {{ with secret "kv/data/gitea" }}{{ .Data.data.internal_token }}{{ end }}
[service] [service]
DISABLE_REGISTRATION = false DISABLE_REGISTRATION = false
@ -73,7 +72,7 @@ DEFAULT_ENABLE_TIMETRACKING = true
NO_REPLY_ADDRESS = noreply.localhost NO_REPLY_ADDRESS = noreply.localhost
[oauth2] [oauth2]
JWT_SECRET = {{ with secret "kv/gitea" }}{{ .Data.jwt_secret }}{{ end }} JWT_SECRET = {{ with secret "kv/data/gitea" }}{{ .Data.data.jwt_secret }}{{ end }}
[mailer] [mailer]
ENABLED = false ENABLED = false
@ -81,3 +80,7 @@ ENABLED = false
[openid] [openid]
ENABLE_OPENID_SIGNIN = true ENABLE_OPENID_SIGNIN = true
ENABLE_OPENID_SIGNUP = true ENABLE_OPENID_SIGNUP = true
[log]
MODE = console
LEVEL = Debug

View file

@ -54,7 +54,7 @@ job "gitea" {
} }
config { config {
image = "gitea:local" image = "magicrb/gitea:yc5q5q4q4zmih2rr1xjamnzxx7agjz55"
ports = ["http"] ports = ["http"]