Combine prod/staging Caddyfile

Author: cache-rules

Caddyfile.prod renamed to Caddyfile

@@ -1,5 +1,5 @@
-www.pspython.com {
-    tls {$TLS_EMAIL}
+{$CADDY_HOST} {
+    tls {$CADDY_TLS_EMAIL}
     gzip
     root /var/www/nerd_herder
 

Caddyfile.staging

@@ -0,0 +1,3 @@
+CADDY_HOST=:8080
+CADDY_TLS_EMAIL=self_signed
+ACME_AGREE=true

caddy.staging.env

@@ -52,14 +52,14 @@ services:
       replicas: 1
       restart_policy:
         condition: on-failure
-    environment:
-      - ACME_AGREE=true
+    env_file:
+      - caddy.staging.env
     depends_on:
       - nerd_herder
     links:
       - nerd_herder
     volumes:
       - './.docker-data/caddy:/root/.caddy'
-      - './Caddyfile.staging:/etc/Caddyfile'
+      - './Caddyfile:/etc/Caddyfile'
     ports:
       - '8080:8080'

docker-compose.staging.yml

@@ -6,4 +6,4 @@ FROM abiosoft/caddy:0.11.0-no-stats
 
 COPY --from=frontend /usr/src/nerd_herder/frontend/build /var/www/nerd_herder/
 COPY --from=backend /usr/src/nerd_herder/static /var/www/nerd_herder/static
-COPY ./Caddyfile.prod /etc/Caddyfile
+COPY ./Caddyfile /etc/Caddyfile