From b5a560c7b88fe4193c816b6b6e637eeeca91b6dd Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Thu, 22 Oct 2020 10:12:30 +0100
Subject: [PATCH] .

---
 .drone/drone-home.jsonnet | 1 +
 .drone/drone-home.yml     | 2 ++
 docker-compose.yml        | 1 +
 gitea/app.ini             | 2 +-
 gitea/run.sh              | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet
index 31caabd..676b094 100644
--- a/.drone/drone-home.jsonnet
+++ b/.drone/drone-home.jsonnet
@@ -34,6 +34,7 @@ local config = {
     publicSecrets,
     secretSecrets,
     [
+      'SCHEME',
       'DOMAIN',
       'REGISTRY_DOMAIN',
       'REGISTRY_PORT',
diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index ae1b1df..b495691 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -154,6 +154,7 @@ steps:
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
+    - scheme
     - domain
     - registry_domain
     - registry_port
@@ -177,6 +178,7 @@ steps:
     - export GITEA_MAILER_FROM=$${GITEA_MAILER_FROM}
     - export GITEA_MAILER_USER=$${GITEA_MAILER_USER}
     - export GITEA_APP_NAME=$${GITEA_APP_NAME}
+    - export SCHEME=$${SCHEME}
     - export DOMAIN=$${DOMAIN}
     - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
     - export REGISTRY_PORT=$${REGISTRY_PORT}
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a6f9a1..c99f2ec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,7 @@ services:
       - USER_UID=1000
       - USER_GID=1000
       - SSH_DOMAIN=${DOMAIN}
+      - SCHEME=${SCHEME}
       - GITEA_APP_NAME=${GITEA_APP_NAME}
       - GITEA_DOMAIN=${DOMAIN}
       - GITEA_SERVER_LFS_JWT_SECRET=$GITEA_SERVER_LFS_JWT_SECRET
diff --git a/gitea/app.ini b/gitea/app.ini
index 7cac1fe..7ab9052 100644
--- a/gitea/app.ini
+++ b/gitea/app.ini
@@ -17,7 +17,7 @@ TEMP_PATH = /data/gitea/uploads
 APP_DATA_PATH    = /data/gitea
 SSH_DOMAIN       = ${DOMAIN}
 HTTP_PORT        = 3000
-ROOT_URL         = https://${GITEA_DOMAIN}/git/
+ROOT_URL         = ${SCHEME}://${GITEA_DOMAIN}/git/
 DISABLE_SSH      = false
 SSH_PORT         = 22
 SSH_LISTEN_PORT  = 22
diff --git a/gitea/run.sh b/gitea/run.sh
index 88fba96..9b8c59c 100644
--- a/gitea/run.sh
+++ b/gitea/run.sh
@@ -1,5 +1,5 @@
 envsubst < /init/app.ini > /data/gitea/conf/app.ini
-mkdir /data/gitea/templates
+mkdir -p /data/gitea/templates
 for file in /init/templates/*
 do
   FILENAME=$(basename "$file")