feat: Add CERTBOT_EMAIL to docker-compose.yaml

Armadillidiid · Mar 8, 2024 · 388229a · 388229a
1 parent 8791bc2
commit 388229a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -68,6 +68,7 @@ jobs:
             echo 'export GOOGLE_MAP_API_KEY="${{ secrets.GOOGLE_MAP_API_KEY }}"' >> export-env
             echo 'export DJANGO_ALLOWED_HOSTS="${{ secrets.DJANGO_ALLOWED_HOSTS }}"' >> 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-ecr
             echo 'export ECR_REPOSITORY="${{ env.ECR_REPOSITORY }}"' >> export-ecr

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -52,6 +52,7 @@ services:
       - APP_HOST=app
       - APP_PORT=8000
       - SERVER_NAME=${SERVER_NAME}
+      - CERTBOT_EMAIL=${CERTBOT_EMAIL}
     volumes:
       - ./nginx/proxy_params:/etc/nginx/proxy_params
       - ./nginx/default.conf.template:/etc/nginx/templates/default.conf.template
@@ -62,7 +63,6 @@ services:
       - ./data/certbot/www:/var/www/certbot
     depends_on:
       - app
-      - certbot
 
   certbot:
     image: certbot/certbot:v2.9.0

diff --git a/nginx/start.sh b/nginx/start.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-domains=($SERVER_NAME)
+domains=($SERVER_NAME www.$SERVER_NAME)
 rsa_key_size=4096
 data_path="./data/certbot"
-email="[email protected]"
-staging=0 # Set to 1 if you're testing your setup to avoid hitting request limits
+email=$CERTBOT_EMAIL
+staging=0 # 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