From ca4e4be38e702baaf679f39f08bf94e770f5d42f Mon Sep 17 00:00:00 2001
From: Chris Thomas <chris.thomas@antimatter-studios.com>
Date: Mon, 24 Jun 2019 11:47:17 +0200
Subject: [PATCH 1/2] - rearrange the templates to make it more logical because
 now ssh_config is a template - implemented the updating of the port to the
 same as the port sent to the gitea config

---
 docker/root/etc/s6/gitea/setup                   | 2 +-
 docker/root/etc/s6/openssh/setup                 | 7 +++++++
 docker/root/etc/templates/{app.ini => gitea.ini} | 0
 docker/root/etc/{ssh => templates}/sshd_config   | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)
 rename docker/root/etc/templates/{app.ini => gitea.ini} (100%)
 rename docker/root/etc/{ssh => templates}/sshd_config (97%)

diff --git a/docker/root/etc/s6/gitea/setup b/docker/root/etc/s6/gitea/setup
index c4fbf5d65ea14..ce94e18059506 100755
--- a/docker/root/etc/s6/gitea/setup
+++ b/docker/root/etc/s6/gitea/setup
@@ -41,7 +41,7 @@ if [ ! -f ${GITEA_CUSTOM}/conf/app.ini ]; then
     DISABLE_REGISTRATION=${DISABLE_REGISTRATION:-"false"} \
     REQUIRE_SIGNIN_VIEW=${REQUIRE_SIGNIN_VIEW:-"false"} \
     SECRET_KEY=${SECRET_KEY:-""} \
-    envsubst < /etc/templates/app.ini > ${GITEA_CUSTOM}/conf/app.ini
+    envsubst < /etc/templates/gitea.ini > ${GITEA_CUSTOM}/conf/app.ini
 
     chown ${USER}:git ${GITEA_CUSTOM}/conf/app.ini
 fi
diff --git a/docker/root/etc/s6/openssh/setup b/docker/root/etc/s6/openssh/setup
index f8ef816a9566b..10d195b74f70d 100755
--- a/docker/root/etc/s6/openssh/setup
+++ b/docker/root/etc/s6/openssh/setup
@@ -24,6 +24,13 @@ if [ ! -f /data/ssh/ssh_host_ecdsa_key ]; then
     ssh-keygen -t ecdsa -b 256 -f /data/ssh/ssh_host_ecdsa_key -N "" > /dev/null
 fi
 
+if [ -d /etc/ssh ]; then
+    SSH_PORT=${SSH_PORT:-"22"} \
+    envsubst < /etc/templates/sshd_config > /etc/ssh/sshd_config
+
+    chmod 0644 /etc/ssh/sshd_config
+fi
+
 chown root:root /data/ssh/*
 chmod 0700 /data/ssh
 chmod 0600 /data/ssh/*
diff --git a/docker/root/etc/templates/app.ini b/docker/root/etc/templates/gitea.ini
similarity index 100%
rename from docker/root/etc/templates/app.ini
rename to docker/root/etc/templates/gitea.ini
diff --git a/docker/root/etc/ssh/sshd_config b/docker/root/etc/templates/sshd_config
similarity index 97%
rename from docker/root/etc/ssh/sshd_config
rename to docker/root/etc/templates/sshd_config
index 6af082c419e63..ba92e236e1712 100644
--- a/docker/root/etc/ssh/sshd_config
+++ b/docker/root/etc/templates/sshd_config
@@ -1,4 +1,4 @@
-Port 22
+Port ${SSH_PORT}
 Protocol 2
 
 AddressFamily any

From 1ee398f2aa97dd5243c6afb01f4efc1ea1d68517 Mon Sep 17 00:00:00 2001
From: Chris Thomas <chris.thomas@antimatter-studios.com>
Date: Mon, 24 Jun 2019 22:29:06 +0200
Subject: [PATCH 2/2] change the filename back

---
 docker/root/etc/s6/gitea/setup                   | 2 +-
 docker/root/etc/templates/{gitea.ini => app.ini} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename docker/root/etc/templates/{gitea.ini => app.ini} (100%)

diff --git a/docker/root/etc/s6/gitea/setup b/docker/root/etc/s6/gitea/setup
index ce94e18059506..c4fbf5d65ea14 100755
--- a/docker/root/etc/s6/gitea/setup
+++ b/docker/root/etc/s6/gitea/setup
@@ -41,7 +41,7 @@ if [ ! -f ${GITEA_CUSTOM}/conf/app.ini ]; then
     DISABLE_REGISTRATION=${DISABLE_REGISTRATION:-"false"} \
     REQUIRE_SIGNIN_VIEW=${REQUIRE_SIGNIN_VIEW:-"false"} \
     SECRET_KEY=${SECRET_KEY:-""} \
-    envsubst < /etc/templates/gitea.ini > ${GITEA_CUSTOM}/conf/app.ini
+    envsubst < /etc/templates/app.ini > ${GITEA_CUSTOM}/conf/app.ini
 
     chown ${USER}:git ${GITEA_CUSTOM}/conf/app.ini
 fi
diff --git a/docker/root/etc/templates/gitea.ini b/docker/root/etc/templates/app.ini
similarity index 100%
rename from docker/root/etc/templates/gitea.ini
rename to docker/root/etc/templates/app.ini