From 2baba46ad4b7a98ad23ee4c6a5123492aaea8ee8 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 10:04:28 +0100
Subject: [PATCH 01/26] feat: overhaul config to utilize  nginx-proxy,
 acme-champion and docker-gen imagesd

---
 .github/workflows/main.yaml         |   9 +-
 docker-compose.yaml                 |  73 ++-
 nginx/Dockerfile                    |  31 --
 nginx/default.conf.template         |   7 +-
 nginx/default.staging.conf.template |  21 -
 nginx/nginx.tmpl                    | 811 ++++++++++++++++++++++++++++
 nginx/options-ssl-nginx.conf        |  14 +
 nginx/ssl-dhparams.pem              |   8 +
 8 files changed, 896 insertions(+), 78 deletions(-)
 delete mode 100644 nginx/Dockerfile
 delete mode 100644 nginx/default.staging.conf.template
 create mode 100644 nginx/nginx.tmpl
 create mode 100644 nginx/options-ssl-nginx.conf
 create mode 100644 nginx/ssl-dhparams.pem

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 265e3a1..0f72634 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -77,7 +77,8 @@ jobs:
             echo 'export IMAGE_TAG="${{ env.IMAGE_TAG }}"' >> export-ecr
 
             source ~/.bash_profile
-            docker stop rumble
-            docker rm rumble
-            cd "${{ secrets.TARGET_DIR }}" && docker compose up -d
-            docker system prune -a
+            cd "${{ secrets.TARGET_DIR }}"
+            docker compose pull app
+            docker compose stop app
+            docker compose up -d app
+            docker system prune -af
diff --git a/docker-compose.yaml b/docker-compose.yaml
index cd99dfb..2fb8d7d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -26,6 +26,7 @@ services:
       - DJANGO_CSRF_TRUSTED_ORIGINS=${DJANGO_CSRF_TRUSTED_ORIGINS}
     depends_on:
       - db
+      - web-server
 
   db:
     image: postgres:15.1-alpine
@@ -45,36 +46,74 @@ services:
       retries: 5
 
   web-server:
-    build:
-      context: ./nginx
-      dockerfile: Dockerfile
-      args:
-        - IS_SSL_ACQUIRED=${IS_SSL_ACQUIRED}
+    image: nginx:1.25.4
     container_name: nginx
-    ports:
-      - "80:80"
-      - "443:443"
     environment:
       - APP_HOST=app
       - APP_PORT=8000
-      - SERVER_NAME=${SERVER_NAME}
-      - CERTBOT_EMAIL=${CERTBOT_EMAIL}
+      - VIRTUAL_HOST=${SERVER_NAME}
+      - LETSENCRYPT_HOST=${SERVER_NAME}
     volumes:
       - static-data:/app/staticfiles
       - media-data:/app/media
-      - ./data/certbot/conf:/etc/letsencrypt
-      - ./data/certbot/www:/var/www/certbot
+      - ./nginx/proxy_params:/etc/nginx/proxy_params
+      - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template
+      - ./nginx/ssl-dhparams.pem:/etc/nginx/ssl-dhparams.pem
+      - ./nginx/options-ssl-nginx.conf:/etc/nginx/options-ssl-nginx.conf
     depends_on:
       - app
+      - nginx-proxy
+      - nginx-proxy-gen
+      - nginx-proxy-acme
+
+  nginx-proxy:
+    image: nginx
+    container_name: nginx-proxy
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - conf:/etc/nginx/conf.d
+      - vhost:/etc/nginx/vhost.d
+      - html:/usr/share/nginx/html
+      - certs:/etc/nginx/certs
 
-  certbot:
-    image: certbot/certbot:v2.9.0
-    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 24h & wait $${!}; done;'"
+  nginx-proxy-gen:
+    image: nginxproxy/docker-gen
+    container_name: nginx-proxy-gen
     volumes:
-      - ./data/certbot/conf:/etc/letsencrypt
-      - ./data/certbot/www:/var/www/certbot
+      - ./nginx/nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    command: -notify-sighup nginx-proxy -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    depends_on:
+      - nginx-proxy
+    restart: always
+
+  nginx-proxy-acme:
+    image: nginxproxy/acme-companion
+    container_name: nginx-proxy-acme
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - acme:/etc/acme.sh
+    environment:
+      - NGINX_DOCKER_GEN_CONTAINER=nginx-proxy-gen
+      - DEFAULT_EMAIL=${CERTBOT_EMAIL}
+    depends_on:
+      - nginx-proxy
+      - nginx-proxy-gen
+    restart: always
 
 volumes:
   db-data:
   static-data:
   media-data:
+  conf:
+  vhost:
+  html:
+  certs:
+  acme:
+
+networks:
+  default:
+    name: nginx-proxy
+    external: true
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
deleted file mode 100644
index cad3f54..0000000
--- a/nginx/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM nginx:1.25.4
-
-# Set the working directory
-WORKDIR /
-
-# Add cron job to reload nginx every 24 hours
-RUN echo "0 0 * * * root docker exec -it nginx nginx -s reload" > /etc/cron.d/nginx-job
-
-# Download extra SSL configuration files
-RUN curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > /options-ssl-nginx.conf && \
-  curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > /ssl-dhparams.pem
-
-# Set the default environment variable
-ARG IS_SSL_ACQUIRED
-
-# Create a directory for template files
-RUN mkdir -p /etc/nginx/templates
-
-# Copy template file based on SSL certificate acquisition
-COPY ./default.conf.template /etc/nginx/templates/default.conf.template
-COPY ./default.staging.conf.template /etc/nginx/templates/default.staging.conf.template
-
-# Copy template file based on SSL certificate acquisition
-RUN if [ "$IS_SSL_ACQUIRED" = "true" ]; then \
-  rm /etc/nginx/templates/default.staging.conf.template; \
-  else \
-  rm /etc/nginx/templates/default.conf.template; \
-  fi
-
-# COPY proxy params
-COPY ./proxy_params /etc/nginx/proxy_params
diff --git a/nginx/default.conf.template b/nginx/default.conf.template
index 3df6beb..c2e2de9 100644
--- a/nginx/default.conf.template
+++ b/nginx/default.conf.template
@@ -16,11 +16,8 @@ server {
     listen [::]:443 ssl http2;
     server_name ${SERVER_NAME};
 
-    ssl_certificate /etc/letsencrypt/live/${SERVER_NAME}/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/${SERVER_NAME}/privkey.pem;
-
-    include /options-ssl-nginx.conf;
-    ssl_dhparam /ssl-dhparams.pem;
+    include /etc/nginx/options-ssl-nginx.conf;
+    ssl_dhparam /etc/nginx/ssl-dhparams.pem;
 
     location /static {
         alias /app/staticfiles/;
diff --git a/nginx/default.staging.conf.template b/nginx/default.staging.conf.template
deleted file mode 100644
index 43f00d7..0000000
--- a/nginx/default.staging.conf.template
+++ /dev/null
@@ -1,21 +0,0 @@
-server {
-  listen 80;
-  server_name ${SERVER_NAME};
-
-  location /.well-known/acme-challenge/ {
-    root /var/www/certbot;
-  }
-
-  location /static {
-      alias /app/staticfiles/;
-  }
-
-  location /media {
-      alias /app/media/;
-  }
-
-  location / {
-    proxy_pass      http://${APP_HOST}:${APP_PORT};
-    include /etc/nginx/proxy_params;
-  }
-}
diff --git a/nginx/nginx.tmpl b/nginx/nginx.tmpl
new file mode 100644
index 0000000..fefb07f
--- /dev/null
+++ b/nginx/nginx.tmpl
@@ -0,0 +1,811 @@
+# nginx-proxy{{ if $.Env.NGINX_PROXY_VERSION }} version : {{ $.Env.NGINX_PROXY_VERSION }}{{ end }}
+
+{{- /*
+     * Global values.  Values are stored in this map rather than in individual
+     * global variables so that the values can be easily passed to embedded
+     * templates.  (Go templates cannot access variables outside of their own
+     * scope.)
+     */}}
+{{- $globals := dict }}
+{{- $_ := set $globals "containers" $ }}
+{{- $_ := set $globals "Env" $.Env }}
+{{- $_ := set $globals "Docker" $.Docker }}
+{{- $_ := set $globals "CurrentContainer" (where $globals.containers "ID" $globals.Docker.CurrentContainerID | first) }}
+{{- $_ := set $globals "default_cert_ok" (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
+{{- $_ := set $globals "external_http_port" (coalesce $globals.Env.HTTP_PORT "80") }}
+{{- $_ := set $globals "external_https_port" (coalesce $globals.Env.HTTPS_PORT "443") }}
+{{- $_ := set $globals "sha1_upstream_name" (parseBool (coalesce $globals.Env.SHA1_UPSTREAM_NAME "false")) }}
+{{- $_ := set $globals "default_root_response" (coalesce $globals.Env.DEFAULT_ROOT "404") }}
+{{- $_ := set $globals "trust_downstream_proxy" (parseBool (coalesce $globals.Env.TRUST_DOWNSTREAM_PROXY "true")) }}
+{{- $_ := set $globals "access_log" (or (and (not $globals.Env.DISABLE_ACCESS_LOGS) "access_log /var/log/nginx/access.log vhost;") "") }}
+{{- $_ := set $globals "enable_ipv6" (parseBool (coalesce $globals.Env.ENABLE_IPV6 "false")) }}
+{{- $_ := set $globals "ssl_policy" (or ($globals.Env.SSL_POLICY) "Mozilla-Intermediate") }}
+{{- $_ := set $globals "vhosts" (dict) }}
+{{- $_ := set $globals "networks" (dict) }}
+# Networks available to the container running docker-gen (which are assumed to
+# match the networks available to the container running nginx):
+{{- /*
+     * Note: $globals.CurrentContainer may be nil in some circumstances due to
+     * <https://github.com/nginx-proxy/docker-gen/issues/458>.  For more context
+     * see <https://github.com/nginx-proxy/nginx-proxy/issues/2189>.
+     */}}
+{{- if $globals.CurrentContainer }}
+    {{- range sortObjectsByKeysAsc $globals.CurrentContainer.Networks "Name" }}
+        {{- $_ := set $globals.networks .Name . }}
+#     {{ .Name }}
+    {{- else }}
+#     (none)
+    {{- end }}
+{{- else }}
+# /!\ WARNING: Failed to find the Docker container running docker-gen.  All
+#              upstream (backend) application containers will appear to be
+#              unreachable.  Try removing the -only-exposed and -only-published
+#              arguments to docker-gen if you pass either of those.  See
+#              <https://github.com/nginx-proxy/docker-gen/issues/458>.
+{{- end }}
+
+{{- /*
+     * Template used as a function to get a container's IP address.  This
+     * template only outputs debug comments; the IP address is "returned" by
+     * storing the value in the provided dot dict.
+     *
+     * The provided dot dict is expected to have the following entries:
+     *   - "globals": Global values.
+     *   - "container": The container's RuntimeContainer struct.
+     *
+     * The return value will be added to the dot dict with key "ip".
+     */}}
+{{- define "container_ip" }}
+    {{- $ip := "" }}
+    #     networks:
+    {{- range sortObjectsByKeysAsc $.container.Networks "Name" }}
+        {{- /*
+             * TODO: Only ignore the "ingress" network for Swarm tasks (in case
+             * the user is not using Swarm mode and names a network "ingress").
+             */}}
+        {{- if eq .Name "ingress" }}
+    #         {{ .Name }} (ignored)
+            {{- continue }}
+        {{- end }}
+        {{- if eq .Name "host" }}
+            {{- /* Handle containers in host nework mode */}}
+            {{- if (index $.globals.networks "host") }}
+    #         both container and proxy are in host network mode, using localhost IP
+                {{- $ip = "127.0.0.1" }}
+                {{- continue }}
+            {{- end }}
+            {{- range sortObjectsByKeysAsc $.globals.CurrentContainer.Networks "Name" }}
+                {{- if and . .Gateway (not .Internal) }}
+    #         container is in host network mode, using {{ .Name }} gateway IP
+                    {{- $ip = .Gateway }}
+                    {{- break }}
+                {{- end }}
+            {{- end }}
+            {{- if $ip }}
+                {{- continue }}
+            {{- end }}
+        {{- end }}
+        {{- if and (not (index $.globals.networks .Name)) (not $.globals.networks.host) }}
+    #         {{ .Name }} (unreachable)
+            {{- continue }}
+        {{- end }}
+        {{- /*
+             * Do not emit multiple `server` directives for this container if it
+             * is reachable over multiple networks.  This avoids accidentally
+             * inflating the effective round-robin weight of a server due to the
+             * redundant upstream addresses that nginx sees as belonging to
+             * distinct servers.
+             */}}
+        {{- if $ip }}
+    #         {{ .Name }} (ignored; reachable but redundant)
+            {{- continue }}
+        {{- end }}
+    #         {{ .Name }} (reachable)
+        {{- if and . .IP }}
+            {{- $ip = .IP }}
+        {{- else }}
+    #             /!\ No IP for this network!
+        {{- end }}
+    {{- else }}
+    #         (none)
+    {{- end }}
+    #     IP address: {{ if $ip }}{{ $ip }}{{ else }}(none usable){{ end }}
+    {{- $_ := set $ "ip" $ip }}
+{{- end }}
+
+{{- /*
+     * Template used as a function to get the port of the server in the given
+     * container.  This template only outputs debug comments; the port is
+     * "returned" by storing the value in the provided dot dict.
+     *
+     * The provided dot dict is expected to have the following entries:
+     *   - "container": The container's RuntimeContainer struct.
+     *
+     * The return value will be added to the dot dict with key "port".
+     */}}
+{{- define "container_port" }}
+    {{- /* If only 1 port exposed, use that as a default, else 80. */}}
+    #     exposed ports:{{ range sortObjectsByKeysAsc $.container.Addresses "Port" }} {{ .Port }}/{{ .Proto }}{{ else }} (none){{ end }}
+    {{- $default_port := when (eq (len $.container.Addresses) 1) (first $.container.Addresses).Port "80" }}
+    #     default port: {{ $default_port }}
+    {{- $port := when (eq $.port "legacy") (or $.container.Env.VIRTUAL_PORT $default_port) $.port }}
+    #     using port: {{ $port }}
+    {{- $addr_obj := where $.container.Addresses "Port" $port | first }}
+    {{- if and $addr_obj $addr_obj.HostPort }}
+    #         /!\ WARNING: Virtual port published on host.  Clients
+    #                      might be able to bypass nginx-proxy and
+    #                      access the container's server directly.
+    {{- end }}
+    {{- $_ := set $ "port" $port }}
+{{- end }}
+
+{{- define "ssl_policy" }}
+    {{- if eq .ssl_policy "Mozilla-Modern" }}
+    ssl_protocols TLSv1.3;
+    {{- /*
+         * This ssl_ciphers directive is not used but necessary to get TLSv1.3 only.
+         * see https://serverfault.com/questions/1023766/nginx-with-only-tls1-3-cipher-suites
+         */}}
+    ssl_ciphers ECDHE-ECDSA-AES256-GCM-SHA384;
+    ssl_conf_command Ciphersuites TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256;
+    ssl_prefer_server_ciphers off;
+    {{- else if eq .ssl_policy "Mozilla-Intermediate" }}
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305';
+    ssl_prefer_server_ciphers off;
+    {{- else if eq .ssl_policy "Mozilla-Old" }}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS13-1-3-2021-06" }}
+    ssl_protocols TLSv1.3;
+    {{- /*
+         * This ssl_ciphers directive is not used but necessary to get TLSv1.3 only.
+         * see https://serverfault.com/questions/1023766/nginx-with-only-tls1-3-cipher-suites
+         */}}
+    ssl_ciphers ECDHE-ECDSA-AES256-GCM-SHA384;
+    ssl_conf_command Ciphersuites TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256;
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS13-1-2-2021-06" }}
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS13-1-2-Res-2021-06" }}
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS13-1-2-Ext1-2021-06" }}
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:AES128-GCM-SHA256:AES128-SHA256:AES256-GCM-SHA384:AES256-SHA256';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS13-1-2-Ext2-2021-06" }}
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS13-1-1-2021-06" }}
+    ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS13-1-0-2021-06" }}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-FS-1-2-Res-2020-10" }}
+    ssl_protocols TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-FS-1-2-Res-2019-08" }}
+    ssl_protocols TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-FS-1-2-2019-08" }}
+    ssl_protocols TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-FS-1-1-2019-08" }}
+    ssl_protocols TLSv1.1 TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-FS-2018-06" }}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS-1-2-Ext-2018-06" }}
+    ssl_protocols TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS-1-2-2017-01" }}
+    ssl_protocols TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:AES128-GCM-SHA256:AES128-SHA256:AES256-GCM-SHA384:AES256-SHA256';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-TLS-1-1-2017-01" }}
+    ssl_protocols TLSv1.1 TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-2016-08" }}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-2015-05" }}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DES-CBC3-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-2015-03" }}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DHE-DSS-AES128-SHA:DES-CBC3-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- else if eq .ssl_policy "AWS-2015-02" }}
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DHE-DSS-AES128-SHA';
+    ssl_prefer_server_ciphers on;
+    {{- end }}
+{{- end }}
+
+{{- define "location" }}
+    {{- $vpath := .VPath }}
+    {{- $override := printf "/etc/nginx/vhost.d/%s_%s_location_override" .Host (sha1 .Path) }}
+    {{- if and (eq .Path "/") (not (exists $override)) }}
+        {{- $override = printf "/etc/nginx/vhost.d/%s_location_override" .Host }}
+    {{- end }}
+    {{- if exists $override }}
+    include {{ $override }};
+    {{- else }}
+        {{- $keepalive := $vpath.keepalive }}
+    location {{ .Path }} {
+        {{- if eq $vpath.network_tag "internal" }}
+        # Only allow traffic from internal clients
+        include /etc/nginx/network_internal.conf;
+        {{- end }}
+
+        {{ $proto := $vpath.proto }}
+        {{ $upstream := $vpath.upstream }}
+        {{ $dest := $vpath.dest }}
+        {{- if eq $proto "uwsgi" }}
+        include uwsgi_params;
+        uwsgi_pass {{ trim $proto }}://{{ trim $upstream }};
+        {{- else if eq $proto "fastcgi" }}
+        root {{ trim .VhostRoot }};
+        include fastcgi_params;
+        fastcgi_pass {{ trim $upstream }};
+            {{- if ne $keepalive "disabled" }}
+        fastcgi_keep_conn on;
+            {{- end }}
+        {{- else if eq $proto "grpc" }}
+        grpc_pass {{ trim $proto }}://{{ trim $upstream }};
+        {{- else if eq $proto "grpcs" }}
+        grpc_pass {{ trim $proto }}://{{ trim $upstream }};
+        {{- else }}
+        proxy_pass {{ trim $proto }}://{{ trim $upstream }}{{ trim $dest }};
+        set $upstream_keepalive {{ if ne $keepalive "disabled" }}true{{ else }}false{{ end }};
+        {{- end }}
+
+        {{- if (exists (printf "/etc/nginx/htpasswd/%s_%s" .Host (sha1 .Path) )) }}
+        auth_basic "Restricted {{ .Host }}{{ .Path }}";
+        auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s_%s" .Host (sha1 .Path)) }};
+        {{- else if (exists (printf "/etc/nginx/htpasswd/%s" .Host)) }}
+        auth_basic "Restricted {{ .Host }}";
+        auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" .Host) }};
+        {{- end }}
+
+        {{- if (exists (printf "/etc/nginx/vhost.d/%s_%s_location" .Host (sha1 .Path) )) }}
+        include {{ printf "/etc/nginx/vhost.d/%s_%s_location" .Host (sha1 .Path) }};
+        {{- else if (exists (printf "/etc/nginx/vhost.d/%s_location" .Host)) }}
+        include {{ printf "/etc/nginx/vhost.d/%s_location" .Host}};
+        {{- else if (exists "/etc/nginx/vhost.d/default_location") }}
+        include /etc/nginx/vhost.d/default_location;
+        {{- end }}
+    }
+    {{- end }}
+{{- end }}
+
+{{- define "upstream" }}
+    {{- $path := .Path }}
+    {{- $vpath := .VPath }}
+upstream {{ $vpath.upstream }} {
+    {{- $servers := 0 }}
+    {{- $loadbalance := $vpath.loadbalance }}
+    {{- if $loadbalance }}
+    # From the container's loadbalance label:
+    {{ $loadbalance }}
+    {{- end }}
+    {{- range $port, $containers := $vpath.ports }}
+        {{- range $container := $containers }}
+    # Container: {{ $container.Name }}
+            {{- $args := dict "globals" $.globals "container" $container }}
+            {{- template "container_ip" $args }}
+            {{- $ip := $args.ip }}
+            {{- $args = dict "container" $container "path" $path "port" $port }}
+            {{- template "container_port" $args }}
+            {{- if $ip }}
+                {{- $servers = add1 $servers }}
+    server {{ $ip }}:{{ $args.port }};
+            {{- end }}
+        {{- end }}
+    {{- end }}
+    {{- /* nginx-proxy/nginx-proxy#1105 */}}
+    {{- if lt $servers 1 }}
+    # Fallback entry
+    server 127.0.0.1 down;
+    {{- end }}
+    {{- $keepalive := $vpath.keepalive }}
+    {{- if and (ne $keepalive "disabled") (gt $servers 0) }}
+        {{- if eq $keepalive "auto" }}
+    keepalive {{ mul $servers 2 }};
+        {{- else }}
+    keepalive {{ $keepalive }};
+        {{- end }}
+    {{- end }}
+}
+{{- end }}
+
+{{- /*
+     * Template used as a function to collect virtual path properties from
+     * the given containers.  These properties are "returned" by storing their
+     * values into the provided dot dict.
+     *
+     * The provided dot dict is expected to have the following entries:
+     *   - "Containers": List of container's RuntimeContainer struct.
+     *   - "Upstream_name"
+     *   - "Has_virtual_paths": boolean
+     *   - "Path"
+     *
+     * The return values will be added to the dot dict with keys:
+     * - "dest"
+     * - "proto"
+     * - "network_tag"
+     * - "upstream"
+     * - "loadbalance"
+     * - "keepalive"
+     */}}
+{{- define "get_path_info" }}
+    {{- /* Get the VIRTUAL_PROTO defined by containers w/ the same vhost-vpath, falling back to "http". */}}
+    {{- $proto := trim (or (first (groupByKeys $.Containers "Env.VIRTUAL_PROTO")) "http") }}
+    {{- /* Get the NETWORK_ACCESS defined by containers w/ the same vhost, falling back to "external". */}}
+    {{- $network_tag := or (first (groupByKeys $.Containers "Env.NETWORK_ACCESS")) "external" }}
+
+    {{- $loadbalance := first (keys (groupByLabel $.Containers "com.github.nginx-proxy.nginx-proxy.loadbalance")) }}
+    {{- $keepalive := coalesce (first (keys (groupByLabel $.Containers "com.github.nginx-proxy.nginx-proxy.keepalive"))) "disabled" }}
+
+    {{- $upstream := $.Upstream_name }}
+    {{- $dest := "" }}
+    {{- if $.Has_virtual_paths }}
+        {{- $sum := sha1 $.Path }}
+        {{- $upstream = printf "%s-%s" $upstream $sum }}
+        {{- $dest = or (first (groupByKeys $.Containers "Env.VIRTUAL_DEST")) "" }}
+    {{- end }}
+    {{- $_ := set $ "proto" $proto }}
+    {{- $_ := set $ "network_tag" $network_tag }}
+    {{- $_ := set $ "upstream" $upstream }}
+    {{- $_ := set $ "dest" $dest }}
+    {{- $_ := set $ "loadbalance" $loadbalance }}
+    {{- $_ := set $ "keepalive" $keepalive }}
+{{- end }}
+
+# If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the
+# scheme used to connect to this server
+map $http_x_forwarded_proto $proxy_x_forwarded_proto {
+    default {{ if $globals.trust_downstream_proxy }}$http_x_forwarded_proto{{ else }}$scheme{{ end }};
+    '' $scheme;
+}
+
+map $http_x_forwarded_host $proxy_x_forwarded_host {
+    default {{ if $globals.trust_downstream_proxy }}$http_x_forwarded_host{{ else }}$host{{ end }};
+    '' $host;
+}
+
+# If we receive X-Forwarded-Port, pass it through; otherwise, pass along the
+# server port the client connected to
+map $http_x_forwarded_port $proxy_x_forwarded_port {
+    default {{ if $globals.trust_downstream_proxy }}$http_x_forwarded_port{{ else }}$server_port{{ end }};
+    '' $server_port;
+}
+
+# Include the port in the Host header sent to the container if it is non-standard
+map $server_port $host_port {
+    default :$server_port;
+    80 '';
+    443 '';
+}
+
+# If the request from the downstream client has an "Upgrade:" header (set to any
+# non-empty value), pass "Connection: upgrade" to the upstream (backend) server.
+# Otherwise, the value for the "Connection" header depends on whether the user
+# has enabled keepalive to the upstream server.
+map $http_upgrade $proxy_connection {
+    default upgrade;
+    '' $proxy_connection_noupgrade;
+}
+map $upstream_keepalive $proxy_connection_noupgrade {
+    # Preserve nginx's default behavior (send "Connection: close").
+    default close;
+    # Use an empty string to cancel nginx's default behavior.
+    true '';
+}
+# Abuse the map directive (see <https://stackoverflow.com/q/14433309>) to ensure
+# that $upstream_keepalive is always defined.  This is necessary because:
+#   - The $proxy_connection variable is indirectly derived from
+#     $upstream_keepalive, so $upstream_keepalive must be defined whenever
+#     $proxy_connection is resolved.
+#   - The $proxy_connection variable is used in a proxy_set_header directive in
+#     the http block, so it is always fully resolved for every request -- even
+#     those where proxy_pass is not used (e.g., unknown virtual host).
+map "" $upstream_keepalive {
+    # The value here should not matter because it should always be overridden in
+    # a location block (see the "location" template) for all requests where the
+    # value actually matters.
+    default false;
+}
+
+# Apply fix for very long server names
+server_names_hash_bucket_size 128;
+
+# Default dhparam
+{{- if (exists "/etc/nginx/dhparam/dhparam.pem") }}
+ssl_dhparam /etc/nginx/dhparam/dhparam.pem;
+{{- end }}
+
+# Set appropriate X-Forwarded-Ssl header based on $proxy_x_forwarded_proto
+map $proxy_x_forwarded_proto $proxy_x_forwarded_ssl {
+    default off;
+    https on;
+}
+
+gzip_types text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+
+{{- /* See https://nginx.org/en/docs/http/ngx_http_log_module.html#log_format for details and variables
+     * LOG_FORMAT_ESCAPE sets the escape part of the log format
+     * LOG_FORMAT        sets the log format
+     */}}
+{{- $logEscape := printf "escape=%s" (or $globals.Env.LOG_FORMAT_ESCAPE "default") }}
+{{- $logFormat := or $globals.Env.LOG_FORMAT `$host $remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" "$upstream_addr"` }}
+
+{{- if parseBool (or $globals.Env.LOG_JSON "false") }}
+    {{- /* LOG_JSON is a shorthand
+        * that sets logging defaults to JSON format
+        */}}
+# JSON Logging enabled (via LOG_JSON env variable)
+    {{- $logEscape = printf "escape=%s" (or $globals.Env.LOG_FORMAT_ESCAPE "json") }}
+    {{- $logFormat = or $globals.Env.LOG_FORMAT `{"time_local":"$time_iso8601","client_ip":"$http_x_forwarded_for","remote_addr":"$remote_addr","request":"$request","status":"$status","body_bytes_sent":"$body_bytes_sent","request_time":"$request_time","upstream_response_time":"$upstream_response_time","upstream_addr":"$upstream_addr","http_referrer":"$http_referer","http_user_agent":"$http_user_agent","request_id":"$request_id"}` }}
+{{- end }}
+
+log_format vhost {{ $logEscape }} '{{ or $globals.Env.LOG_FORMAT $logFormat }}';
+
+access_log off;
+
+{{- template "ssl_policy" (dict "ssl_policy" $globals.ssl_policy) }}
+error_log /dev/stderr;
+
+{{- if $globals.Env.RESOLVERS }}
+resolver {{ $globals.Env.RESOLVERS }};
+{{- end }}
+
+{{- if (exists "/etc/nginx/proxy.conf") }}
+include /etc/nginx/proxy.conf;
+{{- else }}
+# HTTP 1.1 support
+proxy_http_version 1.1;
+proxy_set_header Host $host$host_port;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $proxy_connection;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Host $proxy_x_forwarded_host;
+proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
+proxy_set_header X-Forwarded-Ssl $proxy_x_forwarded_ssl;
+proxy_set_header X-Forwarded-Port $proxy_x_forwarded_port;
+proxy_set_header X-Original-URI $request_uri;
+
+# Mitigate httpoxy attack (see README for details)
+proxy_set_header Proxy "";
+{{- end }}
+
+{{- /* Precompute some information about each vhost. */}}
+{{- range $hostname, $containers := groupByMulti $globals.containers "Env.VIRTUAL_HOST" "," }}
+    {{- $hostname = trim $hostname }}
+    {{- if not $hostname }}
+        {{- /* Ignore containers with VIRTUAL_HOST set to the empty string. */}}
+        {{- continue }}
+    {{- end }}
+
+    {{- $certName := first (groupByKeys $containers "Env.CERT_NAME") }}
+    {{- $vhostCert := closest (dir "/etc/nginx/certs") (printf "%s.crt" $hostname) }}
+    {{- $vhostCert = trimSuffix ".crt" $vhostCert }}
+    {{- $vhostCert = trimSuffix ".key" $vhostCert }}
+    {{- $cert := or $certName $vhostCert }}
+    {{- $cert_ok := and (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert)) }}
+
+    {{- $default := eq $globals.Env.DEFAULT_HOST $hostname }}
+    {{- $https_method := or (first (groupByKeys $containers "Env.HTTPS_METHOD")) $globals.Env.HTTPS_METHOD "redirect" }}
+    {{- $http2_enabled := parseBool (or (first (keys (groupByLabel $containers "com.github.nginx-proxy.nginx-proxy.http2.enable"))) $globals.Env.ENABLE_HTTP2 "true")}}
+    {{- $http3_enabled := parseBool (or (first (keys (groupByLabel $containers "com.github.nginx-proxy.nginx-proxy.http3.enable"))) $globals.Env.ENABLE_HTTP3 "false")}}
+
+    {{- $is_regexp := hasPrefix "~" $hostname }}
+    {{- $upstream_name := when (or $is_regexp $globals.sha1_upstream_name) (sha1 $hostname) $hostname }}
+
+    {{- /* Get the SERVER_TOKENS defined by containers w/ the same vhost, falling back to "". */}}
+    {{- $server_tokens := trim (or (first (groupByKeys $containers "Env.SERVER_TOKENS")) "") }}
+
+    {{- /* Get the SSL_POLICY defined by containers w/ the same vhost, falling back to empty string (use default). */}}
+    {{- $ssl_policy := or (first (groupByKeys $containers "Env.SSL_POLICY")) "" }}
+
+    {{- /* Get the HSTS defined by containers w/ the same vhost, falling back to "max-age=31536000". */}}
+    {{- $hsts := or (first (groupByKeys $containers "Env.HSTS")) (or $globals.Env.HSTS "max-age=31536000") }}
+
+    {{- /* Get the VIRTUAL_ROOT By containers w/ use fastcgi root */}}
+    {{- $vhost_root := or (first (groupByKeys $containers "Env.VIRTUAL_ROOT")) "/var/www/public" }}
+
+
+    {{- $tmp_paths := groupBy $containers "Env.VIRTUAL_PATH" }}
+    {{- $has_virtual_paths := gt (len $tmp_paths) 0}}
+    {{- if not $has_virtual_paths }}
+        {{- $tmp_paths = dict "/" $containers }}
+    {{- end }}
+
+    {{- $paths := dict }}
+
+    {{- range $path, $containers := $tmp_paths }}
+        {{- $args := dict "Containers" $containers "Path" $path "Upstream_name" $upstream_name "Has_virtual_paths" $has_virtual_paths }}
+        {{- template "get_path_info" $args }}
+        {{- $_ := set $paths $path (dict
+            "ports" (dict "legacy" $containers)
+            "dest" $args.dest
+            "proto" $args.proto
+            "network_tag" $args.network_tag
+            "upstream" $args.upstream
+            "loadbalance" $args.loadbalance
+            "keepalive" $args.keepalive
+        ) }}
+    {{- end }}
+
+    {{- $_ := set $globals.vhosts $hostname (dict
+        "cert" $cert
+        "cert_ok" $cert_ok
+        "default" $default
+        "hsts" $hsts
+        "https_method" $https_method
+        "http2_enabled" $http2_enabled
+        "http3_enabled" $http3_enabled
+        "paths" $paths
+        "server_tokens" $server_tokens
+        "ssl_policy" $ssl_policy
+        "vhost_root" $vhost_root
+    ) }}
+{{- end }}
+
+{{- /*
+     * If needed, create a catch-all fallback server to send an error code to
+     * clients that request something from an unknown vhost.
+     *
+     * This server must appear first in the generated config because nginx uses
+     * the first `server` directive to handle requests that don't match any of
+     * the other `server` directives.  An alternative approach would be to add
+     * the `default_server` option to the `listen` directives inside this
+     * `server`, but some users inject a custom `server` directive that uses
+     * `default_server`.  Using `default_server` here would cause nginx to fail
+     * to start for those users.  See
+     * <https://github.com/nginx-proxy/nginx-proxy/issues/2212>.
+     */}}
+{{- block "fallback_server" $globals }}
+    {{- $globals := . }}
+    {{- $http_exists := false }}
+    {{- $https_exists := false }}
+    {{- $default_http_exists := false }}
+    {{- $default_https_exists := false }}
+    {{- $http3_enabled := false }}
+    {{- range $vhost := $globals.vhosts }}
+        {{- $http := or (ne $vhost.https_method "nohttp") (not $vhost.cert_ok) }}
+        {{- $https := ne $vhost.https_method "nohttps" }}
+        {{- $http_exists = or $http_exists $http }}
+        {{- $https_exists = or $https_exists $https }}
+        {{- $default_http_exists = or $default_http_exists (and $http $vhost.default) }}
+        {{- $default_https_exists = or $default_https_exists (and $https $vhost.default) }}
+        {{- $http3_enabled = or $http3_enabled $vhost.http3_enabled }}
+    {{- end }}
+    {{- $fallback_http := and $http_exists (not $default_http_exists) }}
+    {{- $fallback_https := and $https_exists (not $default_https_exists) }}
+    {{- /*
+         * If there are no vhosts at all, create fallbacks for both plain http
+         * and https so that clients get something more useful than a connection
+         * refused error.
+         */}}
+    {{- if and (not $http_exists) (not $https_exists) }}
+        {{- $fallback_http = true }}
+        {{- $fallback_https = true }}
+    {{- end }}
+    {{- if or $fallback_http $fallback_https }}
+server {
+    server_name _; # This is just an invalid value which will never trigger on a real hostname.
+    server_tokens off;
+    {{ $globals.access_log }}
+    http2 on;
+        {{- if $fallback_http }}
+    listen {{ $globals.external_http_port }}; {{- /* Do not add `default_server` (see comment above). */}}
+                {{- if $globals.enable_ipv6 }}
+    listen [::]:{{ $globals.external_http_port }}; {{- /* Do not add `default_server` (see comment above). */}}
+                {{- end }}
+        {{- end }}
+        {{- if $fallback_https }}
+    listen {{ $globals.external_https_port }} ssl; {{- /* Do not add `default_server` (see comment above). */}}
+            {{- if $globals.enable_ipv6 }}
+    listen [::]:{{ $globals.external_https_port }} ssl; {{- /* Do not add `default_server` (see comment above). */}}
+            {{- end }}
+            {{- if $http3_enabled }}
+    http3 on;
+    listen {{ $globals.external_https_port }} quic reuseport; {{- /* Do not add `default_server` (see comment above). */}}
+                {{- if $globals.enable_ipv6 }}
+    listen [::]:{{ $globals.external_https_port }} quic reuseport; {{- /* Do not add `default_server` (see comment above). */}}
+                {{- end }}
+            {{- end }}
+    ssl_session_cache shared:SSL:50m;
+    ssl_session_tickets off;
+        {{- end }}
+        {{- if $globals.default_cert_ok }}
+    ssl_certificate /etc/nginx/certs/default.crt;
+    ssl_certificate_key /etc/nginx/certs/default.key;
+        {{- else }}
+    # No default.crt certificate found for this vhost, so force nginx to emit a
+    # TLS error if the client connects via https.
+    {{- /* See the comment in the main `server` directive for rationale. */}}
+    ssl_ciphers aNULL;
+    set $empty "";
+    ssl_certificate data:$empty;
+    ssl_certificate_key data:$empty;
+    if ($https) {
+        return 444;
+    }
+        {{- end }}
+    return 503;
+}
+    {{- end }}
+{{- end }}
+
+{{- range $hostname, $vhost := $globals.vhosts }}
+    {{- $default_server := when $vhost.default "default_server" "" }}
+
+    {{- range $path, $vpath := $vhost.paths }}
+# {{ $hostname }}{{ $path }}
+        {{ template "upstream" (dict "globals" $globals "Path" $path "VPath" $vpath) }}
+    {{- end }}
+
+    {{- if and $vhost.cert_ok (eq $vhost.https_method "redirect") }}
+server {
+    server_name {{ $hostname }};
+        {{- if $vhost.server_tokens }}
+    server_tokens {{ $vhost.server_tokens }};
+        {{- end }}
+    {{ $globals.access_log }}
+    listen {{ $globals.external_http_port }} {{ $default_server }};
+        {{- if $globals.enable_ipv6 }}
+    listen [::]:{{ $globals.external_http_port }} {{ $default_server }};
+        {{- end }}
+
+    # Do not HTTPS redirect Let's Encrypt ACME challenge
+    location ^~ /.well-known/acme-challenge/ {
+        auth_basic off;
+        auth_request off;
+        allow all;
+        root /usr/share/nginx/html;
+        try_files $uri =404;
+        break;
+    }
+
+    location / {
+        {{- if eq $globals.external_https_port "443" }}
+        return 301 https://$host$request_uri;
+        {{- else }}
+        return 301 https://$host:{{ $globals.external_https_port }}$request_uri;
+        {{- end }}
+    }
+}
+    {{- end }}
+
+server {
+    server_name {{ $hostname }};
+    {{- if $vhost.server_tokens }}
+    server_tokens {{ $vhost.server_tokens }};
+    {{- end }}
+    {{ $globals.access_log }}
+    {{- if $vhost.http2_enabled }}
+    http2 on;
+    {{- end }}
+    {{- if or (eq $vhost.https_method "nohttps") (not $vhost.cert_ok) (eq $vhost.https_method "noredirect") }}
+    listen {{ $globals.external_http_port }} {{ $default_server }};
+        {{- if $globals.enable_ipv6 }}
+    listen [::]:{{ $globals.external_http_port }} {{ $default_server }};
+        {{- end }}
+    {{- end }}
+    {{- if ne $vhost.https_method "nohttps" }}
+    listen {{ $globals.external_https_port }} ssl {{ $default_server }};
+        {{- if $globals.enable_ipv6 }}
+    listen [::]:{{ $globals.external_https_port }} ssl {{ $default_server }};
+        {{- end }}
+
+        {{- if $vhost.http3_enabled }}
+    http3 on;
+    add_header alt-svc 'h3=":{{ $globals.external_https_port }}"; ma=86400;';
+    listen {{ $globals.external_https_port }} quic {{ $default_server }};
+            {{- if $globals.enable_ipv6 }}
+    listen [::]:{{ $globals.external_https_port }} quic {{ $default_server }};
+            {{- end }}
+        {{- end }}
+
+        {{- if $vhost.cert_ok }}
+            {{- template "ssl_policy" (dict "ssl_policy" $vhost.ssl_policy) }}
+
+    ssl_session_timeout 5m;
+    ssl_session_cache shared:SSL:50m;
+    ssl_session_tickets off;
+
+    ssl_certificate /etc/nginx/certs/{{ (printf "%s.crt" $vhost.cert) }};
+    ssl_certificate_key /etc/nginx/certs/{{ (printf "%s.key" $vhost.cert) }};
+
+            {{- if (exists (printf "/etc/nginx/certs/%s.dhparam.pem" $vhost.cert)) }}
+    ssl_dhparam {{ printf "/etc/nginx/certs/%s.dhparam.pem" $vhost.cert }};
+            {{- end }}
+
+            {{- if (exists (printf "/etc/nginx/certs/%s.chain.pem" $vhost.cert)) }}
+    ssl_stapling on;
+    ssl_stapling_verify on;
+    ssl_trusted_certificate {{ printf "/etc/nginx/certs/%s.chain.pem" $vhost.cert }};
+            {{- end }}
+
+            {{- if (not (or (eq $vhost.https_method "noredirect") (eq $vhost.hsts "off"))) }}
+    set $sts_header "";
+    if ($https) {
+        set $sts_header "{{ trim $vhost.hsts }}";
+    }
+    add_header Strict-Transport-Security $sts_header always;
+            {{- end }}
+        {{- else if $globals.default_cert_ok }}
+    # No certificate found for this vhost, so use the default certificate and
+    # return an error code if the user connects via https.
+    ssl_certificate /etc/nginx/certs/default.crt;
+    ssl_certificate_key /etc/nginx/certs/default.key;
+    if ($https) {
+        return 500;
+    }
+        {{- else }}
+    # No certificate found for this vhost, so force nginx to emit a TLS error if
+    # the client connects via https.
+            {{- /*
+                 * The alternative is to not provide an https server for this
+                 * vhost, which would either cause the user to see the wrong
+                 * vhost (if there is another vhost with a certificate) or a
+                 * connection refused error (if there is no other vhost with a
+                 * certificate).  A TLS error is easier to troubleshoot, and is
+                 * safer than serving the wrong vhost.  Also see
+                 * <https://serverfault.com/a/1044022>.
+                 */}}
+    ssl_ciphers aNULL;
+    set $empty "";
+    ssl_certificate data:$empty;
+    ssl_certificate_key data:$empty;
+    if ($https) {
+        return 444;
+    }
+        {{- end }}
+    {{- end }}
+
+    {{- if (exists (printf "/etc/nginx/vhost.d/%s" $hostname)) }}
+    include {{ printf "/etc/nginx/vhost.d/%s" $hostname }};
+    {{- else if (exists "/etc/nginx/vhost.d/default") }}
+    include /etc/nginx/vhost.d/default;
+    {{- end }}
+
+    {{- range $path, $vpath := $vhost.paths }}
+        {{- template "location" (dict
+            "Path" $path
+            "Host" $hostname
+            "VhostRoot" $vhost.vhost_root
+            "VPath" $vpath
+        ) }}
+    {{- end }}
+
+    {{- if and (not (contains $vhost.paths "/")) (ne $globals.default_root_response "none")}}
+    location / {
+        return {{ $globals.default_root_response }};
+    }
+    {{- end }}
+}
+{{- end }}
diff --git a/nginx/options-ssl-nginx.conf b/nginx/options-ssl-nginx.conf
new file mode 100644
index 0000000..f2aadba
--- /dev/null
+++ b/nginx/options-ssl-nginx.conf
@@ -0,0 +1,14 @@
+# This file contains important security parameters. If you modify this file
+# manually, Certbot will be unable to automatically provide future security
+# updates. Instead, Certbot will print and log an error message with a path to
+# the up-to-date file that you will need to refer to when manually updating
+# this file. Contents are based on https://ssl-config.mozilla.org
+
+ssl_session_cache shared:le_nginx_SSL:10m;
+ssl_session_timeout 1440m;
+ssl_session_tickets off;
+
+ssl_protocols TLSv1.2 TLSv1.3;
+ssl_prefer_server_ciphers off;
+
+ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
diff --git a/nginx/ssl-dhparams.pem b/nginx/ssl-dhparams.pem
new file mode 100644
index 0000000..9b182b7
--- /dev/null
+++ b/nginx/ssl-dhparams.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA//////////+t+FRYortKmq/cViAnPTzx2LnFg84tNpWp4TZBFGQz
++8yTnc4kmz75fS/jY2MMddj2gbICrsRhetPfHtXV/WVhJDP1H18GbtCFY2VVPe0a
+87VXE15/V8k1mE8McODmi3fipona8+/och3xWKE2rec1MKzKT0g6eXq8CrGCsyT7
+YdEIqUuyyOP7uWrat2DX9GgdT0Kj3jlN9K5W7edjcrsZCwenyO4KbXCeAvzhzffi
+7MA0BM0oNC9hkXL+nOmFg/+OTxIy7vKBg8P+OxtMb61zO7X8vC7CIAXFjvGDfRaD
+ssbzSibBsu/6iGtCOGEoXJf//////////wIBAg==
+-----END DH PARAMETERS-----

From 6cf447a3c082910ed190a14238d3de4f6cead989 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 16:25:27 +0100
Subject: [PATCH 02/26] fix: resolve dependency cycle loop

---
 docker-compose.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2fb8d7d..7774fa0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -26,7 +26,6 @@ services:
       - DJANGO_CSRF_TRUSTED_ORIGINS=${DJANGO_CSRF_TRUSTED_ORIGINS}
     depends_on:
       - db
-      - web-server
 
   db:
     image: postgres:15.1-alpine

From 0b5b0c0ad4e9e5eb08d244bf4a345bd1851ce978 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 16:42:16 +0100
Subject: [PATCH 03/26] feat: add default value to image tag env and remove
 unused network

---
 docker-compose.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7774fa0..ff81ee5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     build: .
     restart: always
     container_name: rumble
-    image: ${ECR_REGISTRY}/${ECR_REPOSITORY}:${IMAGE_TAG}
+    image: ${ECR_REGISTRY}/${ECR_REPOSITORY}:${IMAGE_TAG:-latest}
     volumes:
       - static-data:/app/staticfiles
       - media-data:/app/media
@@ -111,8 +111,3 @@ volumes:
   html:
   certs:
   acme:
-
-networks:
-  default:
-    name: nginx-proxy
-    external: true

From d912e1dde3982e1f0345c5453fd21c769413cbf3 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 16:43:11 +0100
Subject: [PATCH 04/26] ci: comment out pruning for now

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 0f72634..d2bdbc3 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -81,4 +81,4 @@ jobs:
             docker compose pull app
             docker compose stop app
             docker compose up -d app
-            docker system prune -af
+            # docker system prune -af

From 990f4537de82e7f48ad724d9ff5c81c9ec8f1ff0 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 17:39:40 +0100
Subject: [PATCH 05/26] fix: Update docker compose command for starting the
 application

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index d2bdbc3..37a044e 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -80,5 +80,5 @@ jobs:
             cd "${{ secrets.TARGET_DIR }}"
             docker compose pull app
             docker compose stop app
-            docker compose up -d app
+            docker compose up -d 
             # docker system prune -af

From 3f3ad792e55a26109fd52650f37d9b2d557bebe6 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 17:40:15 +0100
Subject: [PATCH 06/26] fix: add missing volumes from nginx-proxy

---
 docker-compose.yaml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index ff81ee5..e0d76b5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -65,6 +65,19 @@ services:
       - nginx-proxy-gen
       - nginx-proxy-acme
 
+  nginx-proxy-gen:
+    image: nginxproxy/docker-gen
+    container_name: nginx-proxy-gen
+    volumes:
+      - ./nginx/nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - conf:/etc/nginx/conf.d
+      - vhost:/etc/nginx/vhost.d
+      - html:/usr/share/nginx/html
+      - certs:/etc/nginx/certs
+    command: -notify-sighup nginx-proxy -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    restart: always
+
   nginx-proxy:
     image: nginx
     container_name: nginx-proxy
@@ -76,17 +89,8 @@ services:
       - vhost:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - certs:/etc/nginx/certs
-
-  nginx-proxy-gen:
-    image: nginxproxy/docker-gen
-    container_name: nginx-proxy-gen
-    volumes:
-      - ./nginx/nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    command: -notify-sighup nginx-proxy -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
     depends_on:
-      - nginx-proxy
-    restart: always
+      - nginx-proxy-gen
 
   nginx-proxy-acme:
     image: nginxproxy/acme-companion

From aea2a44d2f34ed9d0858a4b3742136ecbbd7e5e3 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 17:59:35 +0100
Subject: [PATCH 07/26] fix: Add additional missing volumes for nginx
 configuration

---
 docker-compose.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index e0d76b5..fbd4006 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -98,6 +98,10 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - acme:/etc/acme.sh
+      - conf:/etc/nginx/conf.d
+      - vhost:/etc/nginx/vhost.d
+      - html:/usr/share/nginx/html
+      - certs:/etc/nginx/certs
     environment:
       - NGINX_DOCKER_GEN_CONTAINER=nginx-proxy-gen
       - DEFAULT_EMAIL=${CERTBOT_EMAIL}

From 08f4fd92d423a6630b6d9827128ef419dc34aaf7 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 19:52:24 +0100
Subject: [PATCH 08/26] feat: set proxy container env

---
 docker-compose.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index fbd4006..4287a27 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -103,6 +103,7 @@ services:
       - html:/usr/share/nginx/html
       - certs:/etc/nginx/certs
     environment:
+      - NGINX_PROXY_CONTAINER=nginx-proxy
       - NGINX_DOCKER_GEN_CONTAINER=nginx-proxy-gen
       - DEFAULT_EMAIL=${CERTBOT_EMAIL}
     depends_on:

From 98746cc98af92001ffdd6351ffc1fc7216058057 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 20:42:31 +0100
Subject: [PATCH 09/26] refactor: remove ssl certs and others from main nginx
 server

---
 docker-compose.yaml         |  9 +++++----
 nginx/default.conf.template | 11 ++++++++---
 nginx/ssl-dhparams.pem      |  8 --------
 3 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 nginx/ssl-dhparams.pem

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4287a27..a5d62cb 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -55,10 +55,10 @@ services:
     volumes:
       - static-data:/app/staticfiles
       - media-data:/app/media
-      - ./nginx/proxy_params:/etc/nginx/proxy_params
-      - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template
-      - ./nginx/ssl-dhparams.pem:/etc/nginx/ssl-dhparams.pem
-      - ./nginx/options-ssl-nginx.conf:/etc/nginx/options-ssl-nginx.conf
+      - certs:/etc/nginx/certs
+      # - ./nginx/proxy_params:/etc/nginx/proxy_params
+      # - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template
+      # - ./nginx/options-ssl-nginx.conf:/etc/nginx/options-ssl-nginx.conf
     depends_on:
       - app
       - nginx-proxy
@@ -120,3 +120,4 @@ volumes:
   html:
   certs:
   acme:
+  docker exec -it nginx-proxy /bin/bash
diff --git a/nginx/default.conf.template b/nginx/default.conf.template
index c2e2de9..a23f0fb 100644
--- a/nginx/default.conf.template
+++ b/nginx/default.conf.template
@@ -12,12 +12,17 @@ server {
 }
 
 server {
-    listen 443 ssl http2;
+    listen 443 ssl;
+    http2 on;
     listen [::]:443 ssl http2;
     server_name ${SERVER_NAME};
 
-    include /etc/nginx/options-ssl-nginx.conf;
-    ssl_dhparam /etc/nginx/ssl-dhparams.pem;
+    # ssl_certificate /etc/nginx/certs/default.crt;
+    # ssl_certificate_key /etc/nginx/certs/default.pem;
+
+    # include /etc/nginx/options-ssl-nginx.conf;
+    # ssl_dhparam /etc/nginx/certs/dhparam.pem;
+
 
     location /static {
         alias /app/staticfiles/;
diff --git a/nginx/ssl-dhparams.pem b/nginx/ssl-dhparams.pem
deleted file mode 100644
index 9b182b7..0000000
--- a/nginx/ssl-dhparams.pem
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA//////////+t+FRYortKmq/cViAnPTzx2LnFg84tNpWp4TZBFGQz
-+8yTnc4kmz75fS/jY2MMddj2gbICrsRhetPfHtXV/WVhJDP1H18GbtCFY2VVPe0a
-87VXE15/V8k1mE8McODmi3fipona8+/och3xWKE2rec1MKzKT0g6eXq8CrGCsyT7
-YdEIqUuyyOP7uWrat2DX9GgdT0Kj3jlN9K5W7edjcrsZCwenyO4KbXCeAvzhzffi
-7MA0BM0oNC9hkXL+nOmFg/+OTxIy7vKBg8P+OxtMb61zO7X8vC7CIAXFjvGDfRaD
-ssbzSibBsu/6iGtCOGEoXJf//////////wIBAg==
------END DH PARAMETERS-----

From ca41807049f8b778986ba7cff23b27a8c0b91d75 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 20:44:33 +0100
Subject: [PATCH 10/26] fix mess

---
 docker-compose.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index a5d62cb..a1fa4fb 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -120,4 +120,3 @@ volumes:
   html:
   certs:
   acme:
-  docker exec -it nginx-proxy /bin/bash

From c57bc8421ac4f38789fcff0194abb4bc8f1418e1 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 20:52:45 +0100
Subject: [PATCH 11/26] fix: uncomment default conf

---
 docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index a1fa4fb..6c4630e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -56,8 +56,8 @@ services:
       - static-data:/app/staticfiles
       - media-data:/app/media
       - certs:/etc/nginx/certs
+      - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template
       # - ./nginx/proxy_params:/etc/nginx/proxy_params
-      # - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template
       # - ./nginx/options-ssl-nginx.conf:/etc/nginx/options-ssl-nginx.conf
     depends_on:
       - app

From 4b1449a152fbbe14ee9fd950a55d887b56026b51 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 21:06:44 +0100
Subject: [PATCH 12/26] refactor: comment out ssl configs in default.conf

---
 nginx/default.conf.template | 61 ++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/nginx/default.conf.template b/nginx/default.conf.template
index a23f0fb..382891a 100644
--- a/nginx/default.conf.template
+++ b/nginx/default.conf.template
@@ -2,27 +2,13 @@ server {
   listen 80;
   server_name ${SERVER_NAME};
 
-  location /.well-known/acme-challenge/ {
-    root /var/www/certbot;
-  }
-
-  location / {
-      return 301 https://$host$request_uri;
-  }
-}
-
-server {
-    listen 443 ssl;
-    http2 on;
-    listen [::]:443 ssl http2;
-    server_name ${SERVER_NAME};
-
-    # ssl_certificate /etc/nginx/certs/default.crt;
-    # ssl_certificate_key /etc/nginx/certs/default.pem;
-
-    # include /etc/nginx/options-ssl-nginx.conf;
-    # ssl_dhparam /etc/nginx/certs/dhparam.pem;
+  # location /.well-known/acme-challenge/ {
+  #   root /var/www/certbot;
+  # }
 
+  # location / {
+  #     return 301 https://$host$request_uri;
+  # }
 
     location /static {
         alias /app/staticfiles/;
@@ -32,8 +18,35 @@ server {
         alias /app/media/;
     }
 
-    location / {
-      proxy_pass      http://${APP_HOST}:${APP_PORT};
-      include /etc/nginx/proxy_params;
-    }
+  location / {
+    proxy_pass      http://${APP_HOST}:${APP_PORT};
+    # include /etc/nginx/proxy_params;
+  }
 }
+
+# server {
+#     listen 443 ssl;
+#     http2 on;
+#     listen [::]:443 ssl http2;
+#     server_name ${SERVER_NAME};
+#
+#     # ssl_certificate /etc/nginx/certs/default.crt;
+#     # ssl_certificate_key /etc/nginx/certs/default.pem;
+#
+#     # include /etc/nginx/options-ssl-nginx.conf;
+#     # ssl_dhparam /etc/nginx/certs/dhparam.pem;
+#
+#
+#     location /static {
+#         alias /app/staticfiles/;
+#     }
+#
+#     location /media {
+#         alias /app/media/;
+#     }
+#
+#     location / {
+#       proxy_pass      http://${APP_HOST}:${APP_PORT};
+#       include /etc/nginx/proxy_params;
+#     }
+# }

From f2bf41fd8d94d949d194c37eacd3531ab738bb19 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sat, 16 Mar 2024 22:13:02 +0100
Subject: [PATCH 13/26] feat: redirect www traffic

---
 docker-compose.yaml         |  2 --
 nginx/default.conf.template | 50 ++++++++-----------------------------
 2 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6c4630e..73469eb 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -57,8 +57,6 @@ services:
       - media-data:/app/media
       - certs:/etc/nginx/certs
       - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template
-      # - ./nginx/proxy_params:/etc/nginx/proxy_params
-      # - ./nginx/options-ssl-nginx.conf:/etc/nginx/options-ssl-nginx.conf
     depends_on:
       - app
       - nginx-proxy
diff --git a/nginx/default.conf.template b/nginx/default.conf.template
index 382891a..56458f4 100644
--- a/nginx/default.conf.template
+++ b/nginx/default.conf.template
@@ -1,14 +1,14 @@
 server {
-  listen 80;
-  server_name ${SERVER_NAME};
+    listen 80;
+    server_name www.${SERVER_NAME};
 
-  # location /.well-known/acme-challenge/ {
-  #   root /var/www/certbot;
-  # }
+    # Redirect www to non-www over HTTPS
+    return 301 https://${SERVER_NAME}$request_uri;
+}
 
-  # location / {
-  #     return 301 https://$host$request_uri;
-  # }
+server {
+    listen 80;
+    server_name ${SERVER_NAME};
 
     location /static {
         alias /app/staticfiles/;
@@ -18,35 +18,7 @@ server {
         alias /app/media/;
     }
 
-  location / {
-    proxy_pass      http://${APP_HOST}:${APP_PORT};
-    # include /etc/nginx/proxy_params;
-  }
+    location / {
+        proxy_pass http://${APP_HOST}:${APP_PORT};
+    }
 }
-
-# server {
-#     listen 443 ssl;
-#     http2 on;
-#     listen [::]:443 ssl http2;
-#     server_name ${SERVER_NAME};
-#
-#     # ssl_certificate /etc/nginx/certs/default.crt;
-#     # ssl_certificate_key /etc/nginx/certs/default.pem;
-#
-#     # include /etc/nginx/options-ssl-nginx.conf;
-#     # ssl_dhparam /etc/nginx/certs/dhparam.pem;
-#
-#
-#     location /static {
-#         alias /app/staticfiles/;
-#     }
-#
-#     location /media {
-#         alias /app/media/;
-#     }
-#
-#     location / {
-#       proxy_pass      http://${APP_HOST}:${APP_PORT};
-#       include /etc/nginx/proxy_params;
-#     }
-# }

From 4c98d9ac162a968e1668341298435265fcbfa97b Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 09:47:47 +0100
Subject: [PATCH 14/26] chore: delete unused nginx SSL and proxy configuration
 files

---
 nginx/options-ssl-nginx.conf | 14 -------------
 nginx/proxy_params           |  6 ------
 nginx/start.sh               | 39 ------------------------------------
 3 files changed, 59 deletions(-)
 delete mode 100644 nginx/options-ssl-nginx.conf
 delete mode 100644 nginx/proxy_params
 delete mode 100755 nginx/start.sh

diff --git a/nginx/options-ssl-nginx.conf b/nginx/options-ssl-nginx.conf
deleted file mode 100644
index f2aadba..0000000
--- a/nginx/options-ssl-nginx.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file contains important security parameters. If you modify this file
-# manually, Certbot will be unable to automatically provide future security
-# updates. Instead, Certbot will print and log an error message with a path to
-# the up-to-date file that you will need to refer to when manually updating
-# this file. Contents are based on https://ssl-config.mozilla.org
-
-ssl_session_cache shared:le_nginx_SSL:10m;
-ssl_session_timeout 1440m;
-ssl_session_tickets off;
-
-ssl_protocols TLSv1.2 TLSv1.3;
-ssl_prefer_server_ciphers off;
-
-ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
diff --git a/nginx/proxy_params b/nginx/proxy_params
deleted file mode 100644
index 77aa626..0000000
--- a/nginx/proxy_params
+++ /dev/null
@@ -1,6 +0,0 @@
-# Contents of /etc/nginx/proxy_params
-
-proxy_set_header Host $http_host;
-proxy_set_header X-Real-IP $remote_addr;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $scheme;
diff --git a/nginx/start.sh b/nginx/start.sh
deleted file mode 100755
index 6de4065..0000000
--- a/nginx/start.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-domains=($SERVER_NAME)
-rsa_key_size=4096
-data_path="../data/certbot" # Path should correspond to the volume mounted in docker-compose.yml
-email=$CERTBOT_EMAIL
-staging=1 # Set to 1 to avoid hitting request limits
-
-if [ -d "$data_path" ]; then
-	read -p "Existing data found for $domains. Continue and replace existing certificate? (y/N) " decision
-	if [ "$decision" != "Y" ] && [ "$decision" != "y" ]; then
-		exit
-	fi
-fi
-
-echo "### Requesting Let's Encrypt certificate for $domains ..."
-#Join $domains to -d args
-domain_args=""
-for domain in "${domains[@]}"; do
-	domain_args="$domain_args -d $domain"
-done
-
-# Select appropriate email arg
-case "$email" in
-"") email_arg="--register-unsafely-without-email" ;;
-*) email_arg="--email $email" ;;
-esac
-
-# Enable staging mode if needed
-if [ $staging != "0" ]; then staging_arg="--staging"; fi
-
-docker compose run --rm --entrypoint "\
-  certbot certonly --webroot -w /var/www/certbot \
-    $staging_arg \
-    $email_arg \
-    $domain_args \
-    --rsa-key-size $rsa_key_size \
-    --agree-tos \
-    --force-renewal" certbot

From c65f1a7f29d6cd1e573c3f67ba701f02aecbfe60 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 09:50:44 +0100
Subject: [PATCH 15/26] feat: Add new docker image tags for app and nginx
 services

---
 .github/workflows/main.yaml |  4 +++-
 docker-compose.yaml         | 13 ++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 37a044e..721243a 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -38,7 +38,8 @@ jobs:
           DJANGO_SECRET_KEY: ${{ secrets.DJANGO_SECRET_KEY }}
         run: |
           docker compose build
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:app-$IMAGE_TAG
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:nginx-$IMAGE_TAG
 
       - name: Set Docker Pull Image Environment Variable
         run: echo "DOCKER_PULL_IMAGE=${{ steps.login-ecr.outputs.registry }}/${ECR_REPOSITORY}:${IMAGE_TAG}" >> $GITHUB_ENV
@@ -55,6 +56,7 @@ jobs:
           REMOTE_HOST: ${{ secrets.HOST_DNS }}
           REMOTE_USER: ${{ secrets.USERNAME }}
           TARGET: ${{ secrets.TARGET_DIR }}
+          SOURCE: "docker-compose.yaml"
           SCRIPT_BEFORE: mkdir -p ${{ secrets.TARGET_DIR }}
           SCRIPT_AFTER: |
             aws ecr get-login-password --region "${{ secrets.AWS_REGION }}" | docker login --username AWS --password-stdin "${{ steps.login-ecr.outputs.registry }}"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 73469eb..b616621 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     build: .
     restart: always
     container_name: rumble
-    image: ${ECR_REGISTRY}/${ECR_REPOSITORY}:${IMAGE_TAG:-latest}
+    image: ${ECR_REGISTRY}/${ECR_REPOSITORY}:app-${IMAGE_TAG:-latest}
     volumes:
       - static-data:/app/staticfiles
       - media-data:/app/media
@@ -44,8 +44,8 @@ services:
       timeout: 5s
       retries: 5
 
-  web-server:
-    image: nginx:1.25.4
+  nginx:
+    image: ${ECR_REGISTRY}/${ECR_REPOSITORY}:nginx-${IMAGE_TAG:-latest}
     container_name: nginx
     environment:
       - APP_HOST=app
@@ -63,19 +63,22 @@ services:
       - nginx-proxy-gen
       - nginx-proxy-acme
 
+  
   nginx-proxy-gen:
     image: nginxproxy/docker-gen
     container_name: nginx-proxy-gen
     volumes:
-      - ./nginx/nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - conf:/etc/nginx/conf.d
       - vhost:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - certs:/etc/nginx/certs
-    command: -notify-sighup nginx-proxy -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    command: >
+      sh -c "curl https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl > /etc/docker-gen/templates/nginx.tmpl &&
+      docker-gen -notify-sighup nginx-proxy -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf"
     restart: always
 
+
   nginx-proxy:
     image: nginx
     container_name: nginx-proxy

From 331e5b6aecd6ff36ed594ffa8ee4ba4b3c9eb116 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 10:07:27 +0100
Subject: [PATCH 16/26] fix: Add nginx build configuration for Dockerfile

---
 docker-compose.yaml | 6 +++---
 nginx/Dockerfile    | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 nginx/Dockerfile

diff --git a/docker-compose.yaml b/docker-compose.yaml
index b616621..183fbac 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -45,6 +45,9 @@ services:
       retries: 5
 
   nginx:
+    build:
+      context: ./nginx
+      dockerfile: Dockerfile
     image: ${ECR_REGISTRY}/${ECR_REPOSITORY}:nginx-${IMAGE_TAG:-latest}
     container_name: nginx
     environment:
@@ -56,14 +59,12 @@ services:
       - static-data:/app/staticfiles
       - media-data:/app/media
       - certs:/etc/nginx/certs
-      - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template
     depends_on:
       - app
       - nginx-proxy
       - nginx-proxy-gen
       - nginx-proxy-acme
 
-  
   nginx-proxy-gen:
     image: nginxproxy/docker-gen
     container_name: nginx-proxy-gen
@@ -78,7 +79,6 @@ services:
       docker-gen -notify-sighup nginx-proxy -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf"
     restart: always
 
-
   nginx-proxy:
     image: nginx
     container_name: nginx-proxy
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
new file mode 100644
index 0000000..794d8c5
--- /dev/null
+++ b/nginx/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx:1.25.4
+COPY ./default.conf.template /etc/nginx/templates/default.conf.template

From 95c2930eee2d040b662fc83847aba3244c4021dd Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 10:16:18 +0100
Subject: [PATCH 17/26] fix: Update docker-compose command to create templates
 directory

---
 docker-compose.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 183fbac..5411a30 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -75,7 +75,8 @@ services:
       - html:/usr/share/nginx/html
       - certs:/etc/nginx/certs
     command: >
-      sh -c "curl https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl > /etc/docker-gen/templates/nginx.tmpl &&
+      sh -c "mkdir -p /etc/docker-gen/templates/ &&
+      curl https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl > /etc/docker-gen/templates/nginx.tmpl &&
       docker-gen -notify-sighup nginx-proxy -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf"
     restart: always
 

From 822ad73514870c282037d3a5d099946d11246e68 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 10:28:17 +0100
Subject: [PATCH 18/26] chore: Remove unnecessary local SSH script files

---
 .github/workflows/main.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 721243a..1af4215 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -83,4 +83,5 @@ jobs:
             docker compose pull app
             docker compose stop app
             docker compose up -d 
+            rm -f local_ssh_script-before-*.sh
             # docker system prune -af

From f3cf10562e92e5fd2986602445fb2e136666e059 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 10:38:40 +0100
Subject: [PATCH 19/26] fix: Use wget instead of curl to download nginx.tmpl

---
 docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5411a30..1b93e67 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -76,7 +76,7 @@ services:
       - certs:/etc/nginx/certs
     command: >
       sh -c "mkdir -p /etc/docker-gen/templates/ &&
-      curl https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl > /etc/docker-gen/templates/nginx.tmpl &&
+      wget -O /etc/docker-gen/templates/nginx.tmpl https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl &&
       docker-gen -notify-sighup nginx-proxy -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf"
     restart: always
 

From c031856c075e56a64270e2a785d252b60efb3bcd Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 11:04:51 +0100
Subject: [PATCH 20/26] fix: Update server_name to use VIRTUAL_HOST variable

---
 nginx/default.conf.template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nginx/default.conf.template b/nginx/default.conf.template
index 56458f4..c3b1b38 100644
--- a/nginx/default.conf.template
+++ b/nginx/default.conf.template
@@ -1,14 +1,14 @@
 server {
     listen 80;
-    server_name www.${SERVER_NAME};
+    server_name www.${VIRTUAL_HOST};
 
     # Redirect www to non-www over HTTPS
-    return 301 https://${SERVER_NAME}$request_uri;
+    return 301 https://${VIRTUAL_HOST}$request_uri;
 }
 
 server {
     listen 80;
-    server_name ${SERVER_NAME};
+    server_name ${VIRTUAL_HOST};
 
     location /static {
         alias /app/staticfiles/;

From ee9bd3a5e63fec652d32fa881e38f7149649d71e Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 11:19:48 +0100
Subject: [PATCH 21/26] final

---
 .github/workflows/main.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 1af4215..5430a67 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -57,7 +57,12 @@ jobs:
           REMOTE_USER: ${{ secrets.USERNAME }}
           TARGET: ${{ secrets.TARGET_DIR }}
           SOURCE: "docker-compose.yaml"
-          SCRIPT_BEFORE: mkdir -p ${{ secrets.TARGET_DIR }}
+          SCRIPT_BEFORE: |
+            mkdir -p ${{ secrets.TARGET_DIR }}
+            if ! grep -q "source export-env" ~/.bash_profile; then
+                echo "source export-env" >> ~/.bash_profile
+            fi
+            touch export-env
           SCRIPT_AFTER: |
             aws ecr get-login-password --region "${{ secrets.AWS_REGION }}" | docker login --username AWS --password-stdin "${{ steps.login-ecr.outputs.registry }}"
 
@@ -72,11 +77,9 @@ jobs:
             echo 'export DJANGO_CSRF_TRUSTED_ORIGINS="${{ secrets.DJANGO_CSRF_TRUSTED_ORIGINS }}"' >> export-env
             echo 'export SERVER_NAME="${{ vars.SERVER_NAME }}"' >> export-env
             echo 'export CERTBOT_EMAIL="${{ secrets.CERTBOT_EMAIL }}"' >> export-env
-            echo 'export IS_SSL_ACQUIRED="${{ vars.IS_SSL_ACQUIRED }}"' >> export-env
-
-            echo 'export ECR_REGISTRY="${{ steps.login-ecr.outputs.registry }}"' > export-ecr
-            echo 'export ECR_REPOSITORY="${{ env.ECR_REPOSITORY }}"' >> export-ecr
-            echo 'export IMAGE_TAG="${{ env.IMAGE_TAG }}"' >> export-ecr
+            echo 'export ECR_REGISTRY="${{ steps.login-ecr.outputs.registry }}"' > export-env
+            echo 'export ECR_REPOSITORY="${{ env.ECR_REPOSITORY }}"' >> export-env
+            echo 'export IMAGE_TAG="${{ env.IMAGE_TAG }}"' >> export-env
 
             source ~/.bash_profile
             cd "${{ secrets.TARGET_DIR }}"
@@ -84,4 +87,4 @@ jobs:
             docker compose stop app
             docker compose up -d 
             rm -f local_ssh_script-before-*.sh
-            # docker system prune -af
+            docker system prune -af

From e288c7a3ac95fa77d91e0911cb2a2c8c3dab6930 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 11:24:29 +0100
Subject: [PATCH 22/26] fix: update export-env script to append ECR_REGISTRY
 line

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 5430a67..222cddd 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -77,7 +77,7 @@ jobs:
             echo 'export DJANGO_CSRF_TRUSTED_ORIGINS="${{ secrets.DJANGO_CSRF_TRUSTED_ORIGINS }}"' >> export-env
             echo 'export SERVER_NAME="${{ vars.SERVER_NAME }}"' >> export-env
             echo 'export CERTBOT_EMAIL="${{ secrets.CERTBOT_EMAIL }}"' >> export-env
-            echo 'export ECR_REGISTRY="${{ steps.login-ecr.outputs.registry }}"' > export-env
+            echo 'export ECR_REGISTRY="${{ steps.login-ecr.outputs.registry }}"' >> export-env
             echo 'export ECR_REPOSITORY="${{ env.ECR_REPOSITORY }}"' >> export-env
             echo 'export IMAGE_TAG="${{ env.IMAGE_TAG }}"' >> export-env
 

From 04b0bc72d46ee8b433ebaacacfdcf329e4941dcc Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 11:38:15 +0100
Subject: [PATCH 23/26] feat: add VIRTUAL_HOST with www subdomain

---
 docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1b93e67..132e197 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -53,7 +53,7 @@ services:
     environment:
       - APP_HOST=app
       - APP_PORT=8000
-      - VIRTUAL_HOST=${SERVER_NAME}
+      - VIRTUAL_HOST="${SERVER_NAME},www.${SERVER_NAME}"
       - LETSENCRYPT_HOST=${SERVER_NAME}
     volumes:
       - static-data:/app/staticfiles

From 2d4082b1d46a9da1d6c5dada4a99599beb89140f Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 12:00:51 +0100
Subject: [PATCH 24/26] fix: Remove quotes around environment variable

---
 docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 132e197..1d591ab 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -53,7 +53,7 @@ services:
     environment:
       - APP_HOST=app
       - APP_PORT=8000
-      - VIRTUAL_HOST="${SERVER_NAME},www.${SERVER_NAME}"
+      - VIRTUAL_HOST=${SERVER_NAME},www.${SERVER_NAME}
       - LETSENCRYPT_HOST=${SERVER_NAME}
     volumes:
       - static-data:/app/staticfiles

From 6b694facfd8f2182d07f7779541b21378a140fd9 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 12:01:22 +0100
Subject: [PATCH 25/26] refactor: Update docker compose commands in workflow

---
 .github/workflows/main.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 222cddd..e9096d8 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -83,8 +83,8 @@ jobs:
 
             source ~/.bash_profile
             cd "${{ secrets.TARGET_DIR }}"
-            docker compose pull app
-            docker compose stop app
+            docker compose pull
+            docker compose down
             docker compose up -d 
             rm -f local_ssh_script-before-*.sh
             docker system prune -af

From fc9f4463998ba032ed19e31f9b58f753acbb0d57 Mon Sep 17 00:00:00 2001
From: Emmanuel Isenah <emmanuelisenah@gmail.com>
Date: Sun, 17 Mar 2024 14:23:37 +0100
Subject: [PATCH 26/26] fix: Update server_name to use SERVER_NAME variable

---
 docker-compose.yaml         | 1 +
 nginx/default.conf.template | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1d591ab..25eefaa 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -53,6 +53,7 @@ services:
     environment:
       - APP_HOST=app
       - APP_PORT=8000
+      - SERVER_NAME=${SERVER_NAME}
       - VIRTUAL_HOST=${SERVER_NAME},www.${SERVER_NAME}
       - LETSENCRYPT_HOST=${SERVER_NAME}
     volumes:
diff --git a/nginx/default.conf.template b/nginx/default.conf.template
index c3b1b38..56458f4 100644
--- a/nginx/default.conf.template
+++ b/nginx/default.conf.template
@@ -1,14 +1,14 @@
 server {
     listen 80;
-    server_name www.${VIRTUAL_HOST};
+    server_name www.${SERVER_NAME};
 
     # Redirect www to non-www over HTTPS
-    return 301 https://${VIRTUAL_HOST}$request_uri;
+    return 301 https://${SERVER_NAME}$request_uri;
 }
 
 server {
     listen 80;
-    server_name ${VIRTUAL_HOST};
+    server_name ${SERVER_NAME};
 
     location /static {
         alias /app/staticfiles/;