From ca0e2e73e7c779f0e62181a0293ca22cb2e457c7 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Thu, 22 Oct 2020 15:35:59 +0100
Subject: [PATCH] feat: scheme is configured

---
 .drone/drone-home.yml               | 8 ++++++++
 .drone/lib/public-secrets.libsonnet | 1 +
 docker-compose.yml                  | 1 +
 ghost/config.production.json        | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index e305a34..4a64944 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -83,12 +83,14 @@ steps:
     - mail_service
     - mail_user
     - commento_origin
+    - scheme
     - mysql_root_password
     script:
     - rm -f env-ghost
     - "echo \"export MAIL_SERVICE='$${MAIL_SERVICE}'\" >> env-ghost # \"mail-service\""
     - "echo \"export MAIL_USER='$${MAIL_USER}'\" >> env-ghost # \"mail-user\""
     - "echo \"export COMMENTO_ORIGIN='$${COMMENTO_ORIGIN}'\" >> env-ghost # \"commento-origin\""
+    - "echo \"export SCHEME='$${SCHEME}'\" >> env-ghost # \"scheme\""
     - "echo \"export MYSQL_ROOT_PASSWORD='$${MYSQL_ROOT_PASSWORD}'\" >> env-ghost # \"mysql-root-password\""
   environment:
     COMMENTO_ORIGIN:
@@ -99,6 +101,8 @@ steps:
       from_secret: mail-user
     MYSQL_ROOT_PASSWORD:
       from_secret: mysql-root-password
+    SCHEME:
+      from_secret: scheme
 
 - name: scp
   image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
@@ -141,12 +145,14 @@ steps:
     - mail_service
     - mail_user
     - commento_origin
+    - scheme
     - mysql_root_password
     script:
     - export MYSQL_ROOT_PASSWORD=$${MYSQL_ROOT_PASSWORD}
     - export MAIL_SERVICE=$${MAIL_SERVICE}
     - export MAIL_USER=$${MAIL_USER}
     - export COMMENTO_ORIGIN=$${COMMENTO_ORIGIN}
+    - export SCHEME=$${SCHEME}
     - export DOMAIN=$${DOMAIN}
     - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
     - export REGISTRY_PORT=$${REGISTRY_PORT}
@@ -165,6 +171,8 @@ steps:
       from_secret: mail-user
     MYSQL_ROOT_PASSWORD:
       from_secret: mysql-root-password
+    SCHEME:
+      from_secret: scheme
 
 services:
 - name: docker
diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet
index 7c25816..05f09ed 100644
--- a/.drone/lib/public-secrets.libsonnet
+++ b/.drone/lib/public-secrets.libsonnet
@@ -2,4 +2,5 @@
   'mail-service',
   'mail-user',
   'commento-origin',
+  'scheme'
 ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 291b4ae..6a0d712 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
       - ghost-content-logs:/var/lib/ghost/content/logs
     environment:
       - DOMAIN=$DOMAIN
+      - SCHEME=$SCHEME
       - MAIL-SERVICE=$MAIL-SERVICE
       - MAIL-USER=$MAIL-USER
       - MAIL-PASSWORD=$MAIL-PASSWORD
diff --git a/ghost/config.production.json b/ghost/config.production.json
index 8827144..7911c3d 100644
--- a/ghost/config.production.json
+++ b/ghost/config.production.json
@@ -1,5 +1,5 @@
 {
-  "url": "https://${DOMAIN}/",
+  "url": "${SCHEME}://${DOMAIN}/",
   "server": {
     "port": 2368,
     "host": "0.0.0.0"