From cc2ba9291d71efdcb49f9f409560e97c3f5a64c2 Mon Sep 17 00:00:00 2001
From: Andros Fenollosa <andros@fenollosa.email>
Date: Fri, 16 Apr 2021 18:35:06 +0200
Subject: [PATCH] Update caddy files

---
 Caddyfile => Caddyfile.dev  |  0
 Caddyfile.pro               | 11 +++++++++++
 Caddyfile.staging           | 11 +++++++++++
 docker-compose.dev.yaml     |  2 +-
 docker-compose.pro.yaml     |  2 +-
 docker-compose.staging.yaml | 35 +++++++++++++++--------------------
 6 files changed, 39 insertions(+), 22 deletions(-)
 rename Caddyfile => Caddyfile.dev (100%)
 create mode 100644 Caddyfile.pro
 create mode 100644 Caddyfile.staging

diff --git a/Caddyfile b/Caddyfile.dev
similarity index 100%
rename from Caddyfile
rename to Caddyfile.dev
diff --git a/Caddyfile.pro b/Caddyfile.pro
new file mode 100644
index 0000000..92cdc0d
--- /dev/null
+++ b/Caddyfile.pro
@@ -0,0 +1,11 @@
+https://api.com
+
+root * /usr/src/app/
+
+@notStatic {
+  not path /static/* /media/*
+}
+
+reverse_proxy @notStatic django:8000
+
+file_server
diff --git a/Caddyfile.staging b/Caddyfile.staging
new file mode 100644
index 0000000..78c735f
--- /dev/null
+++ b/Caddyfile.staging
@@ -0,0 +1,11 @@
+https://beta.api.com
+
+root * /usr/src/app/
+
+@notStatic {
+  not path /static/* /media/*
+}
+
+reverse_proxy @notStatic django:8000
+
+file_server
diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
index b4d7d08..7d4bd08 100644
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -51,7 +51,7 @@ services:
         - 80:80
         - 443:443
     volumes:
-        - ./Caddyfile:/etc/caddy/Caddyfile
+        - ./Caddyfile.dev:/etc/caddy/Caddyfile
         - ./../caddy_data:/data
         - .:/usr/src/app/
     depends_on:
diff --git a/docker-compose.pro.yaml b/docker-compose.pro.yaml
index 1abe9ef..bf4cd88 100644
--- a/docker-compose.pro.yaml
+++ b/docker-compose.pro.yaml
@@ -51,7 +51,7 @@ services:
         - 443:443
     volumes:
         - .:/usr/src/app/
-        - ./Caddyfile:/etc/caddy/Caddyfile
+        - ./Caddyfile.pro:/etc/caddy/Caddyfile
         - ./../caddy_data:/data
     depends_on:
       - django
diff --git a/docker-compose.staging.yaml b/docker-compose.staging.yaml
index 8321c89..377c1ad 100644
--- a/docker-compose.staging.yaml
+++ b/docker-compose.staging.yaml
@@ -8,35 +8,34 @@ services:
     volumes:
       - ./../postgres_data:/var/lib/postgresql/data
     environment:
-      POSTGRES_DB: kualitte
+      POSTGRES_DB: guitarlions
       POSTGRES_PASSWORD: postgres
     expose:
       - 5432
 
   django:
-    build:
-      context: .
-      dockerfile: ./Dockerfiles/django/Dockerfile
+    build: .
     restart: always
     entrypoint: /django-launcher.dev.sh
     volumes:
       - .:/usr/src/app/
     environment:
       DEBUG: "True"
-      ALLOWED_HOSTS: "beta.neo.kualitteauctions.com"
-      SECRET_KEY: "mysecret"
+      ALLOWED_HOSTS: ""
+      SECRET_KEY: "secret"
       DB_HOST: db
-      DB_NAME: "kualitte"
+      DB_NAME: "guitarlions"
       DB_USER: "postgres"
       DB_PASSWORD: "postgres"
       DB_PORT: "5432"
-      DOMAIN: "beta.neo.kualitteauctions.com"
-      DOMAIN_URL: "https://beta.neo.kualitteauctions.com"
+      DOMAIN: ""
+      DOMAIN_URL: "https://"
       STATIC_URL: "/static/"
       MEDIA_URL: "/media/"
-      EMAIL_HOST: "mailhog"
-      EMAIL_USE_TLS: "False"
-      EMAIL_PORT: "1025"
+      EMAIL_USE_TLS: True
+      EMAIL_HOST: ""
+      EMAIL_USE_TLS: "True"
+      EMAIL_PORT: "2525"
       EMAIL_USER: ""
       EMAIL_PASSWORD: ""
     expose:
@@ -51,21 +50,17 @@ services:
         - 80:80
         - 443:443
     volumes:
-        - ./Caddyfile:/etc/caddy/Caddyfile
-        - ./../caddy_data:/data
         - .:/usr/src/app/
+        - ./Caddyfile.staging:/etc/caddy/Caddyfile
+        - ./../caddy_data:/data
     depends_on:
       - django
 
   gulp:
-    build:
-      context: .
-      dockerfile: ./Dockerfiles/gulp/Dockerfile
+    build: Dockerfiles/gulp
     restart: always
     command: gulp
     volumes:
-        - ./gulpfile.js:/usr/src/app/gulpfile.js
-        - ./assets:/usr/src/app/assets
-        - ./static:/usr/src/app/static
+        - .:/app/
     depends_on:
       - caddy