From bfc5c789bc981a0878c8e68bf19652135d923aa6 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Tue, 28 Apr 2020 15:27:18 +0100
Subject: [PATCH] .

---
 .drone-home.star        | 33 ---------------------------------
 docker-compose-home.yml | 34 ----------------------------------
 ngrok-gitea/ngrok._yml  | 22 +++++++++++-----------
 3 files changed, 11 insertions(+), 78 deletions(-)

diff --git a/.drone-home.star b/.drone-home.star
index 370fca3..aff6584 100644
--- a/.drone-home.star
+++ b/.drone-home.star
@@ -34,21 +34,6 @@ def main(ctx):
           #build("letsencrypt-nginx"),
           #build("drone-starlark"),
           #buildDockerFolder(
-          #  "Dockerfile.home",
-          #  "nginx:latest",
-          #  "$${LOCAL_DOCKER_REGISTRY}home",
-          #  "letsencrypt-nginx",
-          #  "home",
-          #),
-          
-          #buildDockerFolder(
-          #  "Dockerfile.blog",
-          #  "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-          #  "$${LOCAL_DOCKER_REGISTRY}letsencrypt-blog",
-          #  "letsencrypt-nginx",
-          #  "blog",
-          #),
-          #buildDockerFolder(
           #  "Dockerfile.drone",
           #  "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
           #  "$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone",
@@ -62,28 +47,10 @@ def main(ctx):
             "letsencrypt-nginx",
             "git",
           ),
-          buildDockerFolder(
-            "Dockerfile.remote",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-remote",
-            "letsencrypt-nginx",
-            "remote",
-          ),
-          buildDockerFolder(
-            "Dockerfile.chat",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-chat",
-            "letsencrypt-nginx",
-            "chat",
-          ),
           scp("~/gitea-drone-stack"),
           pull([
             "letsencrypt-git",
-            "letsencrypt-chat",
             "letsencrypt-drone",
-            "letsencrypt-remote",
-            "letsencrypt-blog",
-            "home",
             "drone-starlark",
             "guacamole-postgresql",
           ]),
diff --git a/docker-compose-home.yml b/docker-compose-home.yml
index f4975e8..815d32a 100644
--- a/docker-compose-home.yml
+++ b/docker-compose-home.yml
@@ -1,39 +1,5 @@
 version: "3.7"
 services:
-  letsencrypt-chat:
-    deploy:
-      placement:
-        constraints: [node.labels.com.sigyl.git-stack == yes]
-      replicas: 1
-      restart_policy:
-        condition: any
-    image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-chat
-    environment:
-      - SERVER_NAME=${CHAT_DOMAIN}
-      - CERTBOT_EMAIL=${CERTBOT_EMAIL}
-      - PROXY_PASS=http://chat:3000/
-    volumes:
-      - letsencrypt-chat:/etc/letsencrypt
-    networks:
-      - appnet
-  letsencrypt-remote:
-    deploy:
-      placement:
-        constraints: [node.labels.com.sigyl.git-stack == yes]
-      replicas: 1
-      restart_policy:
-        condition: any
-    image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-remote
-    environment:
-      - SERVER_NAME=${REMOTE_DOMAIN}
-      - CERTBOT_EMAIL=${CERTBOT_EMAIL}
-      - PROXY_PASS=http://guacamole:8080/guacamole/
-    volumes:
-      - letsencrypt-remote:/etc/letsencrypt
-    networks:
-      - appnet
-    depends_on:
-      - guacamole
   letsencrypt-git:
     deploy:
       placement:
diff --git a/ngrok-gitea/ngrok._yml b/ngrok-gitea/ngrok._yml
index 1e18e55..3a7a5ea 100644
--- a/ngrok-gitea/ngrok._yml
+++ b/ngrok-gitea/ngrok._yml
@@ -3,12 +3,12 @@ update: false
 log: stdout
 region: eu
 tunnels:
-  gitea:
+  home:
     addr: letsencrypt-git:80
     proto: http
     hostname: ${GIT_DOMAIN}
     bind-tls: false
-  gitea-tls:
+  home-tls:
     addr: letsencrypt-git:443
     proto: tls
     hostname: ${GIT_DOMAIN}
@@ -21,15 +21,15 @@ tunnels:
     addr: letsencrypt-drone:443
     proto: tls
     hostname: ${DRONE_DOMAIN}
-  remote:
-    addr: letsencrypt-remote:80
-    proto: http
-    hostname: ${REMOTE_DOMAIN}
-    bind_tls: false
-  remote-tls:
-    addr: letsencrypt-remote:443
-    proto: tls
-    hostname: ${REMOTE_DOMAIN}
+  #remote:
+  #  addr: letsencrypt-remote:80
+  #  proto: http
+  #  hostname: ${REMOTE_DOMAIN}
+  #  bind_tls: false
+  #remote-tls:
+  #  addr: letsencrypt-remote:443
+  #  proto: tls
+  #  hostname: ${REMOTE_DOMAIN}
   #blog:
   #  addr: letsencrypt-blog:80
   #  proto: http