Implemented new matomo setup

roles/Todo.md

@@ -0,0 +1,2 @@
+# Todos
+- Use at all applications the ansible role name as application_id

roles/docker-compose/templates/base.yml.j2

@@ -1,11 +1,11 @@
 {# Base template for all docker-compose.yml.j2 #}
 services:
 {# Load Database #}
-{% if applications[application_id].docker.services.database.enabled | default(false) | bool %}
+{% if applications | is_docker_service_enabled(application_id, 'database') %}
 {% include 'roles/cmp-rdbms/templates/services/main.yml.j2' %}
 {% endif %}
 {# Load Redis #}
-{% if applications[application_id].docker.services.redis.enabled | default(false) | bool %}
+{% if applications | is_docker_service_enabled(application_id, 'redis') %}
 {% include 'roles/svc-db-redis/templates/service.yml.j2' %}
 {% endif %}
 {# Load OAuth2 Proxy #}

roles/docker-compose/templates/networks.yml.j2

@@ -4,7 +4,7 @@ networks:
   {{ applications[ 'svc-db-' ~ database_type ].network }}:
     external: true
 {% endif %}
-{% if applications[application_id].get('features', {}).get('ldap', false) and applications['svc-db-openldap'].network.docker | bool %}
+{% if applications | is_feature_enabled('ldap',application_id) and applications['svc-db-openldap'].network.docker | bool %}
   svc-db-openldap:
     external: true
 {% endif %}

roles/docker-container/templates/depends_on/dbms_base.yml.j2

@@ -2,7 +2,7 @@
       {{ database_host }}:
         condition: service_healthy
 {% endif %}
-{% if applications[application_id].docker.services.redis.enabled | default(false) | bool %}
+{% if applications | is_docker_service_enabled(application_id, 'redis') %}
       redis:
         condition: service_healthy
 {% endif %}

roles/docker-container/templates/depends_on/dmbs_excl.yml.j2

@@ -1,6 +1,6 @@
 {# This template needs to be included in docker-compose.yml containers, which depend on a database, redis and optional additional volumes #}
 {% if
-      (applications[application_id].docker.services.redis.enabled | default(false)| bool) or
+      applications | is_docker_service_enabled(application_id, 'redis') or
       not applications | is_feature_enabled('central_database',application_id) 
     %}
     depends_on:

roles/docker-container/templates/networks.yml.j2

@@ -3,7 +3,7 @@
 {% if applications | is_feature_enabled('central_database',application_id) | bool and database_type is defined %}
       {{ applications[ 'svc-db-' ~ database_type ].network }}:
 {% endif %}
-{% if applications[application_id].get('features', {}).get('ldap', false) | bool and applications['svc-db-openldap'].network.docker|bool %}
+{% if applications | is_feature_enabled('ldap',application_id) | bool and applications['svc-db-openldap'].network.docker|bool %}
       svc-db-openldap:
 {% endif %}
       default:

roles/srv-web-7-7-inj-matomo/templates/matomo-tracking.conf.j2

@@ -1,2 +1,2 @@
 # sub filters to integrate matomo tracking code in nginx websites
-sub_filter '</body>' '<noscript><p><img src="//matomo.{{primary_domain}}/matomo.php?idsite={{matomo_site_id}}&rec=1" style="border:0;" alt="" /></p></noscript></body>';
+sub_filter '</body>' '<noscript><p><img src="//{{ domains | get_domain('web-app-matomo') }}/matomo.php?idsite={{matomo_site_id}}&rec=1" style="border:0;" alt="" /></p></noscript></body>';

roles/srv-web-7-7-inj-matomo/templates/matomo-tracking.js.j2

@@ -7,7 +7,7 @@ _paq.push(["trackPageView"]);
 _paq.push(["trackAllContentImpressions"]);
 _paq.push(["enableLinkTracking"]);
 (function() {
-  var u="//{{ domains | get_domain('matomo') }}/";
+  var u="//{{ domains | get_domain('web-app-matomo') }}/";
   _paq.push(["setTrackerUrl", u+"matomo.php"]);
   _paq.push(["setSiteId", "{{matomo_site_id}}"]);
   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];

roles/srv-web-7-7-inj-matomo/vars/main.yml

@@ -1,4 +1,4 @@
 base_domain:              "{{ domain | regex_replace('^(?:.*\\.)?(.+\\..+)$', '\\1') }}"
-matomo_index_php_url:     "{{ domains | get_url('matomo', web_protocol) }}/index.php"
-matomo_auth_token:        "{{ applications.matomo.credentials.auth_token }}"
+matomo_index_php_url:     "{{ domains | get_url('web-app-matomo', web_protocol) }}/index.php"
+matomo_auth_token:        "{{ applications['web-app-matomo'].credentials.auth_token }}"
 matomo_verification_url:  "{{ matomo_index_php_url }}?module=API&method=SitesManager.getSitesIdFromSiteUrl&url=https://{{ base_domain }}&format=json&token_auth={{ matomo_auth_token }}"

roles/svc-db-mariadb/config/main.yml

@@ -1,4 +1,5 @@
 version:  "latest"
 hostname: "svc-db-mariadb"
-network:  "svc-db-mariadb"
-port:     5432
+network:  "<< defaults_applications[svc-db-mariadb].hostname >>"
+port:     5432
+volume:   "<< defaults_applications[svc-db-mariadb].hostname >>_data"

roles/svc-db-mariadb/tasks/main.yml

@@ -17,7 +17,7 @@
     networks:
       - name: "{{ applications['svc-db-mariadb'].network }}"
     volumes:
-      - mariadb_database:/var/lib/mysql
+      - "{{ applications['svc-db-mariadb'].volume }}:/var/lib/mysql"
     published_ports:
       - "127.0.0.1:{{database_port}}:3306" # can be that this will be removed if all applications use sockets
     command: "--transaction-isolation=READ-COMMITTED --binlog-format=ROW" #for nextcloud
@@ -36,7 +36,7 @@
     state: present
   when: run_once_docker_mariadb is not defined
 
-- name: Wait until the MariaDB container is healthy
+- name: "Wait until the MariaDB container (hostname {{ applications['svc-db-mariadb'].hostname }}) is healthy"
   community.docker.docker_container_info:
     name: "{{ applications['svc-db-mariadb'].hostname }}"
   register: db_info

roles/svc-db-postgres/config/main.yml

@@ -1,6 +1,7 @@
 hostname: "svc-db-postgres"
-network:  "svc-db-postgres"
+network:  "<< defaults_applications[svc-db-postgres].hostname >>"
 port:     5432
+volume:   "<< defaults_applications[svc-db-postgres].hostname >>"
 docker:
   images:
     # Postgis is necessary for mobilizon

roles/svc-db-postgres/tasks/main.yml

@@ -19,7 +19,7 @@
     published_ports:
       - "127.0.0.1:{{ applications[application_id].port }}:5432"
     volumes:
-      - postgres_database:/var/lib/postgresql/data
+      - "{{ applications['svc-db-postgres'].volume }}:/var/lib/postgresql/data"
     restart_policy: "{{ docker_restart_policy }}"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]

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