From 390f2c4a76cbfcc978d787a00b4e30ecade43c75 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Thu, 21 Jun 2018 13:39:05 +0000
Subject: [PATCH] -Disable traefik celery - Added different ACME directory with
 correct persmissions so that it can be added as volume - ACME volume to reuse
 certificate by other containers

---
 {{cookiecutter.project_slug}}/.envs/.production/.caddy    | 3 ---
 .../compose/production/traefik/Dockerfile                 | 5 ++++-
 .../compose/production/traefik/traefik.toml               | 7 ++++---
 {{cookiecutter.project_slug}}/production.yml              | 8 ++++----
 4 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/.envs/.production/.caddy

diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.caddy b/{{cookiecutter.project_slug}}/.envs/.production/.caddy
deleted file mode 100644
index 83d7fc7af..000000000
--- a/{{cookiecutter.project_slug}}/.envs/.production/.caddy
+++ /dev/null
@@ -1,3 +0,0 @@
-# Caddy
-# ------------------------------------------------------------------------------
-DOMAIN_NAME={{ cookiecutter.domain_name }}
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 4505ba52c..7088e6fe3 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,2 +1,5 @@
-FROM traefik
+FROM traefik:alpine
+RUN mkdir -p /etc/traefik/acme
+RUN touch /etc/traefik/acme/acme.json
+RUN chmod 600 /etc/traefik/acme/acme.json
 COPY ./compose/production/traefik/traefik.toml /etc/traefik
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
index e7bfd41e1..2085a825a 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
@@ -1,9 +1,10 @@
-logLevel = "ERROR"
+logLevel = "DEBUG"
 defaultEntryPoints = ["http", "https"]
 
 [web]
 # Port for the status page
-address = ":7080"
+address = ":8080"
+dashboard = true
 
 # Entrypoints, http and https
 [entryPoints]
@@ -21,7 +22,7 @@ address = ":7080"
 [acme]
 # Email address used for registration
 email = "{{ cookiecutter.email }}"
-storageFile = "acme.json"
+storageFile = "/etc/traefik/acme/acme.json"
 entryPoint = "https"
 onDemand = false
 OnHostRule = true
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 3147fbf44..0555d6684 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -3,6 +3,7 @@ version: '2'
 volumes:
   postgres_data: {}
   postgres_backup: {}
+  traefik_acme: {}
 
 services:
   django:{% if cookiecutter.use_celery == 'y' %} &django{% endif %}
@@ -20,7 +21,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.backend=django"
-      - "traefik.frontend.rule={{ cookiecutter.domain_name }}"
+      - "traefik.frontend.rule=Host:{{ cookiecutter.domain_name }}"
       - "traefik.port=5000"
 
   postgres:
@@ -43,12 +44,11 @@ services:
       - django
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      # - ./traefik/traefik.toml:/etc/traefik/traefik.toml:ro
-      # - ./traefik/acme:/etc/traefik/acme
+      - traefik_acme:/etc/traefik/acme
     ports:
      - "80:80"
      - "443:443"
-     - "7080:7080"
+     - "8080:8080"
 
   redis:
     image: redis:3.2