From 1d2ba74afcc3b8c7dbae063ee23d593a571a8434 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Tue, 28 Apr 2020 14:17:31 +0100
Subject: [PATCH] .

---
 .drone-home.star                   | 8 ++++----
 docker-compose-home.yml            | 4 ++--
 guacamole-postgresql/init-user.sql | 6 +++---
 install.md                         | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.drone-home.star b/.drone-home.star
index 2dc4485..53b63b9 100644
--- a/.drone-home.star
+++ b/.drone-home.star
@@ -29,10 +29,10 @@ def main(ctx):
             secretSecrets,
           ),
           wait(15, "wait"),
-          build("guacamole-postgresql"),
-          build("ngrok-gitea"),
-          build("letsencrypt-nginx"),
-          build("drone-starlark"),
+          #build("guacamole-postgresql"),
+          #build("ngrok-gitea"),
+          #build("letsencrypt-nginx"),
+          #build("drone-starlark"),
           buildDockerFolder(
             "Dockerfile.home",
             "nginx:latest",
diff --git a/docker-compose-home.yml b/docker-compose-home.yml
index fc22fd5..2df4c74 100644
--- a/docker-compose-home.yml
+++ b/docker-compose-home.yml
@@ -90,7 +90,7 @@ services:
     environment:
       - USER_UID=1000
       - USER_GID=1000
-      - ROOT_URL=https://${GIT_DOMAIN}/
+      - ROOT_URL=https://${GIT_DOMAIN}/git
       - SSH_DOMAIN=${GIT_DOMAIN}
     volumes:
       - gitea-app:/data
@@ -313,7 +313,7 @@ services:
     deploy:
       placement:
         constraints: [node.labels.com.sigyl.git-stack == yes]
-      replicas: 0 # will scale after mongo initated
+      replicas: 1 # will scale after mongo initated
       restart_policy:
         condition: any
     image: rocketchat/rocket.chat:latest
diff --git a/guacamole-postgresql/init-user.sql b/guacamole-postgresql/init-user.sql
index d2f89c9..6edcbd9 100644
--- a/guacamole-postgresql/init-user.sql
+++ b/guacamole-postgresql/init-user.sql
@@ -1,3 +1,3 @@
-CREATE USER guacamole_user WITH PASSWORD :'password';
-GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA public TO guacamole_user;
-GRANT SELECT,USAGE ON ALL SEQUENCES IN SCHEMA public TO guacamole_user;
\ No newline at end of file
+CREATE USER :'user' WITH PASSWORD :'password';
+GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA public TO :'user';
+GRANT SELECT,USAGE ON ALL SEQUENCES IN SCHEMA public TO :'user';
\ No newline at end of file
diff --git a/install.md b/install.md
index a6b4fee..099b84a 100644
--- a/install.md
+++ b/install.md
@@ -182,7 +182,7 @@ execute initdb.sql
 
 ```
 docker exec -it [id] psql -U postgres -d guacamole_db -f /initdb.sql
-docker exec -it [id] psql -U postgres -d guacamole_db -f /init-user.sql -v password='somepassword'
+docker exec -it [id] psql -U postgres -d guacamole_db -f /init-user.sql -v password='somepassword' -v user='guacamole_user'
 ```
 
 initial admin is guacadmin:guacadmin