From 48c3fbf2f778f7aa0773a3abb08febaa5d6eb597 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 22 Aug 2024 11:26:18 +0200 Subject: [PATCH] fix: nextcloud exporter password --- roles/cadvisor/README.md | 2 +- roles/cadvisor/defaults/main.yml | 1 + roles/nextcloud/README.md | 1 - roles/nextcloud/defaults/main.yml | 1 - roles/nextcloud/tasks/main.yml | 2 +- roles/nextcloud_exporter/README.md | 2 +- roles/nextcloud_exporter/defaults/main.yml | 3 ++- roles/node_exporter/README.md | 2 +- roles/node_exporter/defaults/main.yml | 1 + 9 files changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/cadvisor/README.md b/roles/cadvisor/README.md index f741f600..a7fe5c20 100644 --- a/roles/cadvisor/README.md +++ b/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: diff --git a/roles/cadvisor/defaults/main.yml b/roles/cadvisor/defaults/main.yml index 4933ad58..61309f50 100644 --- a/roles/cadvisor/defaults/main.yml +++ b/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" diff --git a/roles/nextcloud/README.md b/roles/nextcloud/README.md index 25523bc8..6f04189d 100644 --- a/roles/nextcloud/README.md +++ b/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. diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml index 634c248d..2b502d34 100644 --- a/roles/nextcloud/defaults/main.yml +++ b/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 }}" diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 1daec53b..7c9fe0f5 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/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 diff --git a/roles/nextcloud_exporter/README.md b/roles/nextcloud_exporter/README.md index f8f1fadf..d6a23642 100644 --- a/roles/nextcloud_exporter/README.md +++ b/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 }}" diff --git a/roles/nextcloud_exporter/defaults/main.yml b/roles/nextcloud_exporter/defaults/main.yml index a01246be..ee21aac3 100644 --- a/roles/nextcloud_exporter/defaults/main.yml +++ b/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" \ No newline at end of file diff --git a/roles/node_exporter/README.md b/roles/node_exporter/README.md index 260b55d8..d6d8d53b 100644 --- a/roles/node_exporter/README.md +++ b/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: diff --git a/roles/node_exporter/defaults/main.yml b/roles/node_exporter/defaults/main.yml index 83468d51..5335b011 100644 --- a/roles/node_exporter/defaults/main.yml +++ b/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"