From f190d0bc612962d4d62349964e0654b926b7ab11 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sun, 31 Dec 2023 18:20:28 +0100
Subject: [PATCH] Add reload-proxy option to deploy.sh

---
 roles/apps/templates/scripts/deploy.sh.j2          | 4 ++++
 roles/proxy/templates/caddy/Caddyfile.j2           | 7 ++-----
 roles/proxy/templates/docker/docker-compose.yml.j2 | 2 +-
 roles/proxy/templates/scripts/deploy.sh.j2         | 6 ++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/roles/apps/templates/scripts/deploy.sh.j2 b/roles/apps/templates/scripts/deploy.sh.j2
index 8138dee..dd7fe4f 100644
--- a/roles/apps/templates/scripts/deploy.sh.j2
+++ b/roles/apps/templates/scripts/deploy.sh.j2
@@ -22,6 +22,10 @@ restart)
         docker compose -f $app/docker-compose.yml restart
     done
     ;;
+reload-proxy)
+    docker compose -f $APPS_DIR/nginx/docker-compose.yml exec web \
+        sh -c "nginx -t && nginx -s reload"
+    ;;
 *)
     echo "Unrecognized argument"
     exit 1
diff --git a/roles/proxy/templates/caddy/Caddyfile.j2 b/roles/proxy/templates/caddy/Caddyfile.j2
index 28791e0..72abde8 100644
--- a/roles/proxy/templates/caddy/Caddyfile.j2
+++ b/roles/proxy/templates/caddy/Caddyfile.j2
@@ -1,12 +1,8 @@
 {# code: language=ansible-jinja #}
 # THIS FILE IS MANAGED BY ANSIBLE
 
-{
-    admin off
-}
-
 {% for env in ['production', 'staging'] %}
-# Environment: {{ env }}
+# BEGIN Environment: {{ env }}
 
 ipfs.local.{{ proxy_vars[env].app01.apps_base_domain }} {
     tls {{ tls_email }} {
@@ -82,4 +78,5 @@ cloud.{{ proxy_vars[env].app01.apps_base_domain }} {
     reverse_proxy {{ proxy_vars[env].app01.internal_ipv4 }}:8080
 }
 
+# END Environment: {{ env }}
 {% endfor %}
diff --git a/roles/proxy/templates/docker/docker-compose.yml.j2 b/roles/proxy/templates/docker/docker-compose.yml.j2
index 65cec1f..bf7302b 100644
--- a/roles/proxy/templates/docker/docker-compose.yml.j2
+++ b/roles/proxy/templates/docker/docker-compose.yml.j2
@@ -18,4 +18,4 @@ services:
       - net_bind_service
       - dac_override
     cap_drop:
-      - all
\ No newline at end of file
+      - all
diff --git a/roles/proxy/templates/scripts/deploy.sh.j2 b/roles/proxy/templates/scripts/deploy.sh.j2
index b095587..f09bd13 100644
--- a/roles/proxy/templates/scripts/deploy.sh.j2
+++ b/roles/proxy/templates/scripts/deploy.sh.j2
@@ -16,6 +16,12 @@ stop)
 restart)
     docker compose -f $PROXY_DIR/docker-compose.yml restart
     ;;
+reload-proxy)
+    CADDYFILE="/etc/caddy/Caddyfile"
+    docker compose -f $PROXY_DIR/docker-compose.yml exec caddy \
+        sh -c "caddy validate -c $CADDYFILE && caddy reload -c $CADDYFILE" \
+        2>/dev/null
+    ;;
 *)
     echo "Unrecognized argument"
     exit 1