chore: fix deprecation warnings related to changed settings (#113)

owncloud-ops · Jul 17, 2023 · 42a7f9d · 42a7f9d
1 parent 01bb7bd
commit 42a7f9d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -176,7 +176,7 @@ GITEA_SECURITY_CSRF_COOKIE_HTTP_ONLY=true
 GITEA_SERVICE_ACTIVE_CODE_LIVE_MINUTES=180
 GITEA_SERVICE_RESET_PASSWD_CODE_LIVE_MINUTES=180
 GITEA_SERVICE_REGISTER_EMAIL_CONFIRM=false
-GITEA_SERVICE_EMAIL_DOMAIN_WHITELIST=
+GITEA_SERVICE_EMAIL_DOMAIN_ALLOWLIST=
 GITEA_SERVICE_DISABLE_REGISTRATION=
 GITEA_SERVICE_ALLOW_ONLY_EXTERNAL_REGISTRATION=false
 GITEA_SERVICE_REQUIRE_SIGNIN_VIEW=false

diff --git a/overlay/etc/templates/app.ini.tmpl b/overlay/etc/templates/app.ini.tmpl
@@ -203,7 +203,7 @@ CSRF_COOKIE_HTTP_ONLY = {{ getenv "GITEA_SECURITY_CSRF_COOKIE_HTTP_ONLY" "true"
 ACTIVE_CODE_LIVE_MINUTES = {{ getenv "GITEA_SERVICE_ACTIVE_CODE_LIVE_MINUTES" "180" }}
 RESET_PASSWD_CODE_LIVE_MINUTES = {{ getenv "GITEA_SERVICE_RESET_PASSWD_CODE_LIVE_MINUTES" "180" }}
 REGISTER_EMAIL_CONFIRM = {{ getenv "GITEA_SERVICE_REGISTER_EMAIL_CONFIRM" "false" | conv.ToBool }}
-EMAIL_DOMAIN_WHITELIST = {{ getenv "GITEA_SERVICE_EMAIL_DOMAIN_WHITELIST" }}
+EMAIL_DOMAIN_ALLOWLIST = {{ getenv "GITEA_SERVICE_EMAIL_DOMAIN_ALLOWLIST" }}
 DISABLE_REGISTRATION = {{ getenv "GITEA_SERVICE_DISABLE_REGISTRATION" }}
 ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ getenv "GITEA_SERVICE_ALLOW_ONLY_EXTERNAL_REGISTRATION" "false" | conv.ToBool }}
 REQUIRE_SIGNIN_VIEW = {{ getenv "GITEA_SERVICE_REQUIRE_SIGNIN_VIEW" "false" | conv.ToBool }}
@@ -288,17 +288,22 @@ ROOT_PATH = console
 MODE = console
 BUFFER_LEN = {{ getenv "GITEA_LOG_BUFFER_LEN" "10000" }}
 ROUTER_LOG_LEVEL = {{ getenv "GITEA_LOG_ROUTER_LOG_LEVEL" "Error" }}
-ROUTER = console
-ENABLE_ACCESS_LOG = {{ getenv "GITEA_LOG_ENABLE_ACCESS_LOG" "false" | conv.ToBool }}
+LEVEL = {{ getenv "GITEA_LOG_LEVEL" "Error" }}
+STACKTRACE_LEVEL = {{ getenv "GITEA_LOG_STACKTRACE_LEVEL" "None" }}
 {{- if getenv "GITEA_LOG_ACCESS_LOG_TEMPLATE" }}
 ACCESS_LOG_TEMPLATE = {{ getenv "GITEA_LOG_ACCESS_LOG_TEMPLATE" }}
 {{- end }}
-ACCESS = console
-LEVEL = {{ getenv "GITEA_LOG_LEVEL" "Error" }}
-STACKTRACE_LEVEL = {{ getenv "GITEA_LOG_STACKTRACE_LEVEL" "None" }}
+
+[log.router]
+MODE = console
 
 [log.console]
 STDERR = false
+{{- if getenv "GITEA_LOG_ENABLE_ACCESS_LOG" "false" | conv.ToBool }}
+
+[log.access]
+MODE = console
+{{- end }}
 
 [cron]
 ENABLED = {{ getenv "GITEA_CRON_ENABLED" "true" | conv.ToBool }}

diff --git a/overlay/usr/bin/healthcheck b/overlay/usr/bin/healthcheck
@@ -3,7 +3,7 @@
 # shellcheck disable=SC3040
 set -eo pipefail
 
-URL=http://127.0.0.1:3000
+URL=http://127.0.0.1:3000/api/healthz
 wget --quiet --tries=1 --spider ${URL} || exit 1
 
 exit 0