fix: nextcloud exporter password

roles/cadvisor/README.md

@@ -16,7 +16,7 @@ cadvisor_description: docker monitoring for server1 # default: "cAdvisor {{ inve
 cadvisor_nginx_data_dir: /usr/share/nginx/proxies # default: "{{ nginx_data_dir }}/proxies"
 cadvisor_requires_package: python2-passlib # default: python3-passlib
 cadvisor_proxy_basic_auth_username: exporter # default: cadvisor
-cadvisor_proxy_basic_auth_password: "{{ vault_cadvisor_proxy_basic_auth_password }}"
+cadvisor_proxy_basic_auth_password: # default: "{{ vault_cadvisor_proxy_basic_auth_password }}"
 ```
 
 Ensure the nginx proxy includes the cadvisor config:

roles/cadvisor/defaults/main.yml

@@ -2,4 +2,5 @@
 cadvisor_requires_package: python3-passlib
 cadvisor_description: cAdvisor {{ inventory_hostname_short }}
 cadvisor_proxy_basic_auth_username: cadvisor
+cadvisor_proxy_basic_auth_password: "{{ vault_cadvisor_proxy_basic_auth_password }}"
 cadvisor_nginx_data_dir: "{{ nginx_data_dir }}/proxies"

roles/nextcloud/README.md

@@ -31,7 +31,6 @@ nextcloud_mail_username: bot@example.com
 nextcloud_mail_password: "{{ vault_nextcloud_mail_password }}"
 nextcloud_redis_hostname: redis01
 nextcloud_redis_password: "{{ vault_nextcloud_redis_password }}"
-nextcloud_integrity_check: true # default: false
 ```
 
 And include it in your playbook.

roles/nextcloud/defaults/main.yml

@@ -3,7 +3,6 @@ nextcloud_description: Nextcloud
 nextcloud_timezone: Europe/Berlin
 nextcloud_volume_name: "{{ nextcloud_hostname }}"
 nextcloud_trusted_domains: "{{ nextcloud_domain }}"
-nextcloud_integrity_check: false
 nextcloud_build_image: false
 vault_nextcloud_postgres_password: "{{ vault_nextcloud_admin_password }}"
 nextcloud_postgres_password: "{{ vault_nextcloud_postgres_password }}"

roles/nextcloud/tasks/main.yml

@@ -21,6 +21,6 @@
 
 - name: Include {{ role_name }} config tasks
   ansible.builtin.include_tasks: "{{ role_name }}_config.yml"
-  when: nextcloud_integrity_check
+  when: nextcloud_image is defined
   tags:
     - nextcloud

roles/nextcloud_exporter/README.md

@@ -16,7 +16,7 @@ nextcloud_exporter_description: Host metric for server1 # default: "Nextcloud Ex
 nextcloud_exporter_nginx_data_dir: /usr/share/nginx/proxies # default: "{{ nginx_data_dir }}/proxies"
 nextcloud_exporter_requires_package: python2-passlib # default: python3-passlib
 nextcloud_exporter_proxy_basic_auth_username: exporter # default: nextcloud-exporter
-nextcloud_exporter_proxy_basic_auth_password: "{{ vault_node_exporter_proxy_basic_auth_password }}"
+nextcloud_exporter_proxy_basic_auth_password: # default "{{ vault_nextcloud_exporter_proxy_basic_auth_password }}"
 nextcloud_exporter_server: http://nextcloud01
 nextcloud_exporter_username: "{{ nextcloud_admin_user }}"
 nextcloud_exporter_password: "{{ nextcloud_admin_password }}"

roles/nextcloud_exporter/defaults/main.yml

@@ -1,5 +1,6 @@
 ---
 nextcloud_exporter_requires_package: python3-passlib
 nextcloud_exporter_description: Nextcloud Exporter {{ nextcloud_hostname }}
-nextcloud_exporter_nginx_data_dir: "{{ nginx_data_dir }}/proxies"
 nextcloud_exporter_proxy_basic_auth_username: nextcloud-exporter
+nextcloud_exporter_proxy_basic_auth_password: "{{ vault_nextcloud_exporter_proxy_basic_auth_password }}"
+nextcloud_exporter_nginx_data_dir: "{{ nginx_data_dir }}/proxies"

roles/node_exporter/README.md

@@ -16,7 +16,7 @@ node_exporter_description: Host metrics for server1 # default: "Node Exporter {{
 node_exporter_nginx_data_dir: /usr/share/nginx/proxies # default: "{{ nginx_data_dir }}/proxies"
 node_exporter_requires_package: python2-passlib # default: python3-passlib
 node_exporter_proxy_basic_auth_username: exporter # default: node-exporter
-node_exporter_proxy_basic_auth_password: "{{ vault_node_exporter_proxy_basic_auth_password }}"
+node_exporter_proxy_basic_auth_password: # default: "{{ vault_node_exporter_proxy_basic_auth_password }}"
 ```
 
 Ensure the nginx proxy includes the node-exporter config:

roles/node_exporter/defaults/main.yml

@@ -2,4 +2,5 @@
 node_exporter_requires_package: python3-passlib
 node_exporter_description: Node Exporter {{ inventory_hostname_short }}
 node_exporter_proxy_basic_auth_username: node-exporter
+node_exporter_proxy_basic_auth_password: "{{ vault_node_exporter_proxy_basic_auth_password }}"
 node_exporter_nginx_data_dir: "{{ nginx_data_dir }}/proxies"