From 921181cc8d26e95cd5cfcf9b9d1a40be91e30588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20=C5=BDeby?= <morlinest@gmail.com>
Date: Thu, 2 Nov 2017 12:14:13 +0100
Subject: [PATCH 1/2] Fix ordering in app.ini and remove unused config option

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

diff --git a/docker/etc/s6/gitea/setup b/docker/etc/s6/gitea/setup
index 30884bc411715..b14eba278411a 100755
--- a/docker/etc/s6/gitea/setup
+++ b/docker/etc/s6/gitea/setup
@@ -21,7 +21,6 @@ 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"} \
     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 0dcf41be1481e..956b7a4c4288d 100644
--- a/docker/etc/templates/app.ini
+++ b/docker/etc/templates/app.ini
@@ -1,6 +1,6 @@
-[repository]
 APP_NAME = $APP_NAME
-APP_MODE = $APP_MODE
+
+[repository]
 ROOT = /data/git/repositories
 
 [repository.upload]

From 7a96d78eb2e09c306a2bfa400cd4b7482837e1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20=C5=BDeby?= <morlinest@gmail.com>
Date: Thu, 2 Nov 2017 21:51:55 +0100
Subject: [PATCH 2/2] Fix option name and ordering instead of removing it

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

diff --git a/docker/etc/s6/gitea/setup b/docker/etc/s6/gitea/setup
index b14eba278411a..e6dd3ffa2b55b 100755
--- a/docker/etc/s6/gitea/setup
+++ b/docker/etc/s6/gitea/setup
@@ -21,6 +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"} \
+    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 956b7a4c4288d..2375f8f533a9a 100644
--- a/docker/etc/templates/app.ini
+++ b/docker/etc/templates/app.ini
@@ -1,4 +1,5 @@
 APP_NAME = $APP_NAME
+RUN_MODE = $RUN_MODE
 
 [repository]
 ROOT = /data/git/repositories