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

---
 .drone/drone-home.yml               | 16 ----------------
 .drone/lib/public-secrets.libsonnet |  5 +----
 docker-compose.yml                  |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index b83a259..1d4d621 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -85,21 +85,13 @@ steps:
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
-    - postgres_db
-    - postgres_user
     - postgres_password
     script:
     - rm -f env-guacamole
-    - "echo \"export POSTGRES_DB='$${POSTGRES_DB}'\" >> env-guacamole # \"postgres-db\""
-    - "echo \"export POSTGRES_USER='$${POSTGRES_USER}'\" >> env-guacamole # \"postgres-user\""
     - "echo \"export POSTGRES_PASSWORD='$${POSTGRES_PASSWORD}'\" >> env-guacamole # \"postgres-password\""
   environment:
-    POSTGRES_DB:
-      from_secret: postgres-db
     POSTGRES_PASSWORD:
       from_secret: postgres-password
-    POSTGRES_USER:
-      from_secret: postgres-user
 
 - name: scp
   image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
@@ -138,13 +130,9 @@ steps:
     - registry_domain
     - registry_port
     - registry_password
-    - postgres_db
-    - postgres_user
     - postgres_password
     script:
     - export POSTGRES_PASSWORD=$${POSTGRES_PASSWORD}
-    - export POSTGRES_DB=$${POSTGRES_DB}
-    - export POSTGRES_USER=$${POSTGRES_USER}
     - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
     - export REGISTRY_PORT=$${REGISTRY_PORT}
     - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}
@@ -154,12 +142,8 @@ steps:
     - sh .drone/pull.sh
     - sh .drone/deploy.sh
   environment:
-    POSTGRES_DB:
-      from_secret: postgres-db
     POSTGRES_PASSWORD:
       from_secret: postgres-password
-    POSTGRES_USER:
-      from_secret: postgres-user
 
 services:
 - name: docker
diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet
index c6cd72e..fe51488 100644
--- a/.drone/lib/public-secrets.libsonnet
+++ b/.drone/lib/public-secrets.libsonnet
@@ -1,4 +1 @@
-[
-  'postgres-db',
-  'postgres-user',
-]
+[]
diff --git a/docker-compose.yml b/docker-compose.yml
index bb266a9..68ea012 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ services:
     environment:
       - POSTGRES_HOSTNAME=guacamole-postgresql
       - POSTGRES_PORT=5432
-      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_USER=guacamole_user
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_DATABASE=guacamole_db
       - GUACD_HOSTNAME=guacd