Solved bugs occuring during setup of yourls

roles/backup-docker-to-local/tasks/main.yml

@@ -46,7 +46,6 @@
     cmd: "python database_entry_seeder.py databases.csv {{docker_compose_project_name}} {{database_host}} {{database_databasename}} {{database_username}} {{database_password}}"
     chdir: "{{backup_docker_to_local_folder}}"
   when: >
-    docker_compose_project_name is defined or
     database_host is defined or
     database_databasename is defined or
     database_username is defined or
@@ -59,8 +58,7 @@
     owner: root
     group: root
   when: >
-    (docker_compose_project_name is defined or
-    database_host is defined or
+    (database_host is defined or
     database_databasename is defined or
     database_username is defined or
     database_password is defined) and

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

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
     image: docker.io/akaunting/akaunting:{{version_akaunting}}

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

@@ -3,7 +3,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   web:
     image: attendize_web:latest

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

@@ -4,7 +4,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   baserow:
     image: baserow/baserow:1.19.1

roles/docker-bigbluebutton/vars/main.yml

@@ -1,6 +1,5 @@
 docker_compose_project_name:        "bigbluebutton"
-docker_compose_instance_directory:  "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
-database_host:                      "postgres"
+database_host:                      "postgres" # needs to be fixed
 database_databasename:              "greenlight-v3"
 database_username:                  "postgres"
 database_password:  	              ""

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

@@ -2,7 +2,7 @@ version: '3'
 
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
     logging:

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

@@ -3,7 +3,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   web:
     image: 'gitlab/gitlab-ee:latest'

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

@@ -2,7 +2,7 @@ version: '3'
 
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
     image: joomla

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

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
     restart: unless-stopped

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

@@ -4,7 +4,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   # Core services
   resolver:

roles/docker-mailu/vars/main.yml

@@ -1,6 +1,2 @@
 docker_compose_project_name:        "mailu"
-docker_compose_instance_directory:  "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
-database_host:      	              "database"
-database_databasename:              "{{docker_compose_project_name}}"
-database_username:  	              "{{docker_compose_project_name}}"
 database_password:  	              "{{mailu_database_password}}"

roles/docker-mariadb/tasks/main.yml

@@ -29,6 +29,12 @@
     timeout: 120
   when: run_once_docker_mariadb is not defined
 
+- name: install python-mysqlclient
+  pacman: 
+    name: python-mysqlclient
+    state: present
+  when: run_once_docker_mariadb is not defined
+
 - name: create database
   mysql_db:
     name: "{{database_databasename}}"
@@ -37,7 +43,6 @@
     login_password: "{{central_mariadb_root_password}}"
     login_host: 127.0.0.1
     login_port: 3306
-  listen: create database
 
 - name: create database user
   mysql_user:
@@ -49,7 +54,6 @@
     login_password: "{{central_mariadb_root_password}}"
     login_host: 127.0.0.1
     login_port: 3306
-  listen: create database
 
 - name: run the docker_mariadb tasks once
   set_fact:

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

@@ -3,7 +3,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   web:
     image: tootsuite/mastodon:{{version_mastodon}}

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

@@ -2,7 +2,7 @@ version: '3'
 
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
     logging:

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

@@ -2,7 +2,7 @@ version: '3.1'
 
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   synapse:
     image: matrixdotorg/synapse:latest

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

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
     logging:

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

@@ -4,7 +4,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
     image: "nextcloud:{{version_nextcloud}}-fpm-alpine"

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

@@ -21,7 +21,7 @@ x-op-app: &app
 
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   cache:
     image: memcached

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

@@ -4,7 +4,7 @@ services:
   
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
     image: chocobozzz/peertube:production-bullseye

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

@@ -2,7 +2,7 @@ version: '2'
 
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 

roles/docker-postgres/tasks/main.yml

@@ -34,7 +34,6 @@
     login_password: "{{ central_postgres_password }}"
     login_host: 127.0.0.1
     login_port: 5432
-  listen: create database
 
 - name: Create database user
   postgresql_user:
@@ -47,7 +46,6 @@
     login_password: "{{ central_postgres_password }}"
     login_host: 127.0.0.1
     login_port: 5432
-  listen: create database
 
 - name: Run the docker_postgres tasks once
   set_fact:

roles/docker-roulette-wheel/vars/main.yml

@@ -1,3 +1,2 @@
 docker_compose_project_name:      "roulette-wheel"
-docker_compose_instance_directory: "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
 app_path: "{{docker_compose_instance_directory}}/app/"

roles/docker-yourls/meta/main.yml

@@ -1,2 +0,0 @@
-dependencies:
-- docker-compose

roles/docker-yourls/tasks/main.yml

@@ -2,6 +2,10 @@
 - name: include docker vars
   include_vars: vars/docker-database-service.yml.j2
 
+- name: load docker compose dependencies
+  include_role:
+    name: docker-compose
+
 - name: create central database
   include_role:
     name: docker-{{database_type}}

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

@@ -2,7 +2,7 @@ version: '3'
 
 services:
 
-{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
     logging:

roles/nginx/tasks/main.yml

@@ -4,6 +4,13 @@
   notify: restart nginx
   when: run_once_nginx is not defined
 
+- name: install nginx-mod-headers-more for matomo
+  pacman: 
+    name: nginx-mod-headers-more
+    state: present
+  notify: restart nginx
+  when: run_once_nginx is not defined and nginx_matomo_tracking | bool
+
 - name: Ensure nginx configuration directories are present
   file:
     path: "{{ item }}"

roles/nginx/templates/nginx.conf.j2

@@ -1,4 +1,7 @@
+{% if nginx_matomo_tracking | bool %}
 load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
+{% endif %}
+
 worker_processes auto;
 
 events