From 529f9d03ce578555d87657265cb1b25d7b81ecf6 Mon Sep 17 00:00:00 2001
From: Morlinest <morlinest@gmail.com>
Date: Thu, 2 Nov 2017 22:08:21 +0100
Subject: [PATCH] Fix ordering in app.ini and fix run mode option (#2829)

---
 docker/etc/s6/gitea/setup    | 2 +-
 docker/etc/templates/app.ini | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/etc/s6/gitea/setup b/docker/etc/s6/gitea/setup
index 30884bc41171..e6dd3ffa2b55 100755
--- a/docker/etc/s6/gitea/setup
+++ b/docker/etc/s6/gitea/setup
@@ -21,7 +21,7 @@ if [ ! -f /data/gitea/conf/app.ini ]; then
 
     # Substitude the environment variables in the template
     APP_NAME=${APP_NAME:-"Gitea: Git with a cup of tea"} \
-    APP_MODE=${APP_MODE:-"dev"} \
+    RUN_MODE=${RUN_MODE:-"dev"} \
     SSH_DOMAIN=${SSH_DOMAIN:-"localhost"} \
     HTTP_PORT=${HTTP_PORT:-"3000"} \
     ROOT_URL=${ROOT_URL:-""} \
diff --git a/docker/etc/templates/app.ini b/docker/etc/templates/app.ini
index 0dcf41be1481..2375f8f533a9 100644
--- a/docker/etc/templates/app.ini
+++ b/docker/etc/templates/app.ini
@@ -1,6 +1,7 @@
-[repository]
 APP_NAME = $APP_NAME
-APP_MODE = $APP_MODE
+RUN_MODE = $RUN_MODE
+
+[repository]
 ROOT = /data/git/repositories
 
 [repository.upload]