THE HUGE REFACTORING CALENDER WEEK 33; Optimized Matrix and during this updated variables, and implemented better reset and cleanup mode handling, also solved some initial setup bugs

roles/web-app-nextcloud/docs/Update.md

@@ -41,10 +41,10 @@ and disable any non-functioning apps.
 ## Recover Latest Backup 💾
 
 ```bash
-cd {{path_docker_compose_instances}}nextcloud &&
+cd {{ PATH_DOCKER_COMPOSE_INSTANCES }}nextcloud &&
 docker-compose down &&
 docker-compose exec -i database mysql -u nextcloud -pPASSWORT nextcloud < "/Backups/$(sha256sum /etc/machine-id | head -c 64)/sys-bkp-docker-2-loc/latest/nextcloud_database/sql/backup.sql" &&
-cd {{path_administrator_scripts}}sys-bkp-docker-2-loc &&
+cd {{ PATH_ADMINISTRATOR_SCRIPTS }}sys-bkp-docker-2-loc &&
 bash ./recover-web-app-from-local.sh "nextcloud_data" "$(sha256sum /etc/machine-id | head -c 64)"
 ```
 

roles/web-app-nextcloud/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-- name: "include role for {{application_id}} to receive certs & do modification routines"
+- name: "include role for {{ application_id }} to receive certs & do modification routines"
   include_role:
     name: srv-web-7-6-composer
 
@@ -9,7 +9,7 @@
     dest: "{{ nextcloud_host_nginx_path }}"
   notify: restart openresty
 
-- name: "load docker and db for {{application_id}}"
+- name: "load docker and db for {{ application_id }}"
   include_role: 
     name: cmp-db-docker
   vars:

roles/web-app-nextcloud/templates/config/oidc.config.php.j2

@@ -11,17 +11,17 @@ return array (
     'lost_password_link' => 'disabled',
 
     // URL of provider. All other URLs are auto-discovered from .well-known
-    'oidc_login_provider_url' => '{{oidc.client.issuer_url}}',
+    'oidc_login_provider_url' => '{{ oidc.client.issuer_url }}',
 
     // Client ID and secret registered with the provider
-    'oidc_login_client_id' => '{{oidc.client.id}}',
-    'oidc_login_client_secret' => '{{oidc.client.secret}}',
+    'oidc_login_client_id' => '{{ oidc.client.id }}',
+    'oidc_login_client_secret' => '{{ oidc.client.secret }}',
 
     // Automatically redirect the login page to the provider
     'oidc_login_auto_redirect' => true,
 
     // Redirect to this page after logging out the user
-    'oidc_login_logout_url' => 'https://{{domains | get_domain(application_id)}}',
+    'oidc_login_logout_url' => 'https://{{ domains | get_domain(application_id) }}',
 
     // If set to true the user will be redirected to the
     // logout endpoint of the OIDC provider after logout
@@ -36,7 +36,7 @@ return array (
     'oidc_login_default_quota' => '{{applications | get_app_conf(application_id, 'default_quota', True)}}',
 
     // Login button text
-    'oidc_login_button_text' => '{{oidc.button_text}}',
+    'oidc_login_button_text' => '{{ oidc.button_text }}',
 
     // Hide the NextCloud password change form.
     'oidc_login_hide_password_form' => true,

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

@@ -37,7 +37,7 @@
     container_name: "{{ nextcloud_proxy_name }}"
     logging:
       driver: journald
-    restart: {{DOCKER_RESTART_POLICY}}
+    restart: {{ DOCKER_RESTART_POLICY }}
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
     volumes:
@@ -53,7 +53,7 @@
   cron:
     container_name: "{{ nextcloud_cron_name }}"
     image: "{{ nextcloud_image }}:{{ nextcloud_version }}"
-    restart: {{DOCKER_RESTART_POLICY}}
+    restart: {{ DOCKER_RESTART_POLICY }}
     logging:
       driver: journald
     volumes:

roles/web-app-nextcloud/templates/nginx/host.conf.j2

@@ -2,7 +2,7 @@
 
 server
 {
-  server_name {{domain}};
+  server_name {{ domain }};
 
   {% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
 

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

@@ -23,7 +23,7 @@ nextcloud_control_node_plugin_tasks_directory:  "{{role_path}}/tasks/plugins/"
 ## Host Paths
 nextcloud_host_config_additives_directory:      "{{ docker_compose.directories.volumes }}infinito/"             # This folder is the path to which the additive configurations will be copied
 nextcloud_host_include_instructions_file:       "{{ docker_compose.directories.volumes }}includes.php"          # Path to the instruction file on the host. Responsible for loading the additional configurations
-nextcloud_host_nginx_path:                      "{{ nginx.directories.http.servers }}{{ domains | get_domain(application_id) }}.conf" # Nginx path for proxy conf
+nextcloud_host_nginx_path:                      "{{ NGINX.DIRECTORIES.HTTP.SERVERS }}{{ domains | get_domain(application_id) }}.conf" # Nginx path for proxy conf
 
 # Docker
 

roles/web-app-nextcloud/vars/system.yml

@@ -15,7 +15,7 @@ nextcloud_system_config:
     value: "{{ HOST_LL | upper }}"
 
   - parameter: "trusted_domains 0"
-    value: "{{domains | get_domain(application_id)}}"
+    value: "{{ domains | get_domain(application_id) }}"
 
   - parameter: "overwrite.cli.url"
     value: "{{ domains | get_url(application_id, WEB_PROTOCOL) }}"