Implemented new matomo setup

roles/web-app-matomo/config/main.yml

@@ -1,7 +1,11 @@
 images:
   matomo:             "matomo:latest"
 features:
-  matomo:             true
+  # If you want to use Matomo on the Matomo page, you 
+  # have to set it here manual to true. 
+  # It's deactivated, because the proxy setup for Matomo
+  # itself wouldn't be possible 
+  matomo:             false 
   css:                false
   portfolio_iframe:   true
   central_database:   true
@@ -24,9 +28,13 @@ csp:
 domains:
   aliases:
     - "analytics.{{ primary_domain }}"
+  canonical:
+    - "matomo.{{ primary_domain }}"
 excluded_ips: "{{ networks.internet.values() | list }}"
 
 docker:
   services:
     database:
-      enabled: true
+      enabled: true
+    redis:
+      enabled: false

roles/web-app-matomo/templates/docker-compose.yml.j2

@@ -2,7 +2,7 @@
   application:
 {% set container_port = 80 %}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-    image: "{{ applications[application_id].images[application_id] }}"
+    image: "{{ applications[application_id].images['matomo'] }}"
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
     volumes:

roles/web-app-matomo/vars/main.yml

@@ -1,9 +1,9 @@
 ---
-application_id:       "matomo"
+application_id:       "web-app-matomo"
 database_type:        "mariadb"
-matomo_excluded_ips:  "{{ applications.matomo.excluded_ips }}"
-matomo_index_php_url: "{{ domains | get_url('matomo', web_protocol) }}/index.php"
-matomo_auth_token:    "{{ applications.matomo.credentials.auth_token }}"
+matomo_excluded_ips:  "{{ applications[application_id].excluded_ips }}"
+matomo_index_php_url: "{{ domains | get_url(application_id, web_protocol) }}/index.php"
+matomo_auth_token:    "{{ applications[application_id].credentials.auth_token }}"
 
 
 # I don't know if this is still necessary