2 files changed, 16 insertions, 29 deletions
diff --git a/internal/conf/testdata/TestInit.golden.ini b/internal/conf/testdata/TestInit.golden.ini
index e5a8d066..3dc112d6 100644
--- a/internal/conf/testdata/TestInit.golden.ini
+++ b/internal/conf/testdata/TestInit.golden.ini
@@ -1,7 +1,6 @@
 BRAND_NAME=Testing
 RUN_USER=git
 RUN_MODE=test
-APP_NAME=
 
 [server]
 EXTERNAL_URL=http://localhost:3080/
@@ -20,8 +19,6 @@ ENABLE_GZIP=false
 APP_DATA_PATH=/tmp/data
 LOAD_ASSETS_FROM_DISK=false
 LANDING_URL=/explore
-ROOT_URL=
-LANDING_PAGE=
 DISABLE_SSH=false
 SSH_DOMAIN=localhost
 SSH_PORT=22
@@ -68,8 +65,6 @@ SSL_MODE=disable
 PATH=/tmp/gogs.db
 MAX_OPEN_CONNS=30
 MAX_IDLE_CONNS=30
-DB_TYPE=
-PASSWD=
 
 [security]
 INSTALL_LOCK=false
@@ -80,11 +75,10 @@ COOKIE_USERNAME=gogs_awesome
 COOKIE_SECURE=false
 ENABLE_LOGIN_STATUS_COOKIE=false
 LOGIN_STATUS_COOKIE_NAME=login_status
-REVERSE_PROXY_AUTHENTICATION_USER=
 
 [email]
 ENABLED=true
-SUBJECT_PREFIX=[Gogs] 
+SUBJECT_PREFIX=[Testing] 
 HOST=smtp.mailgun.org:587
 FROM=noreply@gogs.localhost
 USER=noreply@gogs.localhost
@@ -97,7 +91,6 @@ CERT_FILE=custom/email/cert.pem
 KEY_FILE=custom/email/key.pem
 USE_PLAIN_TEXT=false
 ADD_PLAIN_TEXT_ALT=false
-PASSWD=
 
 [auth]
 ACTIVATE_CODE_LIVES=10
@@ -109,11 +102,6 @@ ENABLE_REGISTRATION_CAPTCHA=true
 ENABLE_REVERSE_PROXY_AUTHENTICATION=false
 ENABLE_REVERSE_PROXY_AUTO_REGISTRATION=false
 REVERSE_PROXY_AUTHENTICATION_HEADER=X-FORWARDED-FOR
-ACTIVE_CODE_LIVE_MINUTES=0
-RESET_PASSWD_CODE_LIVE_MINUTES=0
-REGISTER_EMAIL_CONFIRM=false
-ENABLE_CAPTCHA=false
-ENABLE_NOTIFY_MAIL=false
 
 [user]
 ENABLE_EMAIL_NOTIFICATION=true
@@ -126,8 +114,6 @@ COOKIE_SECURE=false
 GC_INTERVAL=10
 MAX_LIFE_TIME=10
 CSRF_COOKIE_NAME=_csrf
-GC_INTERVAL_TIME=0
-SESSION_LIFE_TIME=0
 
 [attachment]
 ENABLED=true
diff --git a/internal/conf/testdata/custom.ini b/internal/conf/testdata/custom.ini
index ca7160d0..0ebdbacf 100644
--- a/internal/conf/testdata/custom.ini
+++ b/internal/conf/testdata/custom.ini
@@ -1,13 +1,13 @@
-APP_NAME = Testing
+BRAND_NAME = Testing
 RUN_MODE = test
 
 [server]
-ROOT_URL = http://localhost:3080/
+EXTERNAL_URL = http://localhost:3080/
 APP_DATA_PATH = /tmp/data
 SSH_ROOT_PATH = /tmp
 SSH_KEY_TEST_PATH = /tmp/ssh-key-test
 MINIMUM_KEY_SIZE_CHECK = true
-LANDING_PAGE = explore
+LANDING_URL = /explore
 
 [repository]
 ROOT = /tmp/gogs-repositories
@@ -16,27 +16,28 @@ ROOT = /tmp/gogs-repositories
 TEMP_PATH = /tmp/uploads
 
 [database]
-DB_TYPE = sqlite
-PASSWD = 12345678
+TYPE = sqlite
+PASSWORD = 12345678
 PATH = /tmp/gogs.db
 
-[security]
-REVERSE_PROXY_AUTHENTICATION_USER=X-FORWARDED-FOR
-
 [email]
 ENABLED = true
-PASSWD = 87654321
+PASSWORD = 87654321
 
 [auth]
-ACTIVE_CODE_LIVE_MINUTES = 10
-RESET_PASSWD_CODE_LIVE_MINUTES = 10
-REGISTER_EMAIL_CONFIRM = true
+ACTIVATE_CODE_LIVES = 10
+RESET_PASSWORD_CODE_LIVES = 10
+REQUIRE_EMAIL_CONFIRMATION = true
 ENABLE_CAPTCHA = true
 ENABLE_NOTIFY_MAIL = true
+REVERSE_PROXY_AUTHENTICATION_HEADER=X-FORWARDED-FOR
+
+[user]
+ENABLE_EMAIL_NOTIFICATION = true
 
 [session]
-GC_INTERVAL_TIME = 10
-SESSION_LIFE_TIME = 10
+GC_INTERVAL = 10
+MAX_LIFE_TIME = 10
 
 [attachment]
 PATH = /tmp/attachments