From 0160d7b58f51e2a4c59d2dd4cca654d30d361fa6 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Thu, 20 Dec 2018 10:33:24 +0200
Subject: [PATCH] Added GoAccess analytics

---
 cookiecutter.json                                      |  1 +
 docs/deployment-with-docker.rst                        |  3 +++
 .../compose/production/caddy/Caddyfile                 |  4 ++++
 {{cookiecutter.project_slug}}/production.yml           | 10 ++++++++++
 4 files changed, 18 insertions(+)

diff --git a/cookiecutter.json b/cookiecutter.json
index b5dda0c70..8ddca9abd 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -41,6 +41,7 @@
   "use_heroku": "n",
   "use_travisci": "n",
   "keep_local_envs_in_vcs": "y",
+  "use_goaccess": "n",
 
   "debug": "n"
 }
diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index f6e21e828..feb59405b 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -118,6 +118,9 @@ To see how your containers are doing run::
 
     docker-compose -f production.yml ps
 
+To view the GoAccess analytics run::
+
+    docker-compose -f production.yml run --rm goaccess goaccess --log-format COMBINED --log-file /srv/logs/requests.log
 
 Example: Supervisor
 -------------------
diff --git a/{{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile b/{{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile
index 323e43922..b218d49a0 100644
--- a/{{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile
+++ b/{{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile
@@ -9,7 +9,11 @@ www.{% raw %}{$DOMAIN_NAME}{% endraw %} {
         header_upstream X-Forwarded-Proto {scheme}
         header_upstream X-CSRFToken {~csrftoken}
     }
+    {%- if cookiecutter.use_goaccess == "y" %}
+    log / /var/log/caddy/requests.log "{combined}"
+    {%- else %}
     log stdout
+    {%- endif %}
     errors stdout
     gzip
 }
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index fd8388acb..7855f6fc4 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -4,6 +4,7 @@ volumes:
   production_postgres_data: {}
   production_postgres_data_backups: {}
   production_caddy: {}
+  production_caddy_log: {}
 
 services:
   django:{% if cookiecutter.use_celery == 'y' %} &django{% endif %}
@@ -39,6 +40,7 @@ services:
       - django
     volumes:
       - production_caddy:/root/.caddy
+      - production_caddy_log:/var/log/caddy
     env_file:
       - ./.envs/.production/.caddy
     ports:
@@ -67,3 +69,11 @@ services:
     command: /start-flower
 
   {%- endif %}
+
+  {% if cookiecutter.use_goaccess == "y" %}
+  goaccess:
+    image: allinurl/goaccess
+    volumes:
+      - production_caddy_log:/srv/logs
+
+  {% endif %}
\ No newline at end of file