diff --git a/roles/nextcloud/tasks/configure.yml b/roles/nextcloud/tasks/configure.yml index a667e8f..11c6473 100644 --- a/roles/nextcloud/tasks/configure.yml +++ b/roles/nextcloud/tasks/configure.yml @@ -18,7 +18,7 @@ args: chdir: "{{ nextcloud_dir }}" creates: "{{ nextcloud_dir }}/apps/{{ item }}" - with_items: "{{ nextcloud_occ_install_app }}" + loop: "{{ nextcloud_occ_install_app }}" - name: Set configs via occ become: true @@ -56,7 +56,7 @@ architecture_alias: "arm64" # noqa: var-naming[no-role-prefix] when: ansible_architecture == "aarch64" -- name: "Download nextcloud_exporter from GitHub (v{{ nextcloud_exporter_version.tag }})" +- name: "Download nextcloud_exporter from GitHub" get_url: url: "https://github.com/xperimental/nextcloud-exporter/releases/download/\ v{{ nextcloud_exporter_version.tag }}/nextcloud-exporter_{{ nextcloud_exporter_version.tag }}\ @@ -101,7 +101,7 @@ nextcloud_notify_push_version: "{{ nextcloud_notify_push_version | replace('v', '', 1) | trim }}" run_once: true -- name: "Download nextcloud_notify_push from GitHub (v{{ nextcloud_notify_push_version.tag }})" +- name: "Download nextcloud_notify_push from GitHub" get_url: url: "https://github.com/nextcloud/notify_push/releases/download/v{{ nextcloud_notify_push_version.tag }}\ /notify_push-{{ ansible_architecture }}-unknown-linux-musl" diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index b21142d..57fbdae 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -1,5 +1,4 @@ --- - - name: Set architecture alias set_fact: architecture_alias: "amd64" # noqa: var-naming[no-role-prefix] diff --git a/roles/nginx_exporter/tasks/main.yml b/roles/nginx_exporter/tasks/main.yml index 8da32a4..7697496 100644 --- a/roles/nginx_exporter/tasks/main.yml +++ b/roles/nginx_exporter/tasks/main.yml @@ -24,7 +24,7 @@ architecture_alias: "arm64" # noqa: var-naming[no-role-prefix] when: ansible_architecture == "aarch64" -- name: "Download nginx_exporter from GitHub (v{{ nginx_exporter_version.tag }})" +- name: "Download nginx_exporter from GitHub" get_url: url: "https://github.com/nginxinc/nginx-prometheus-exporter/releases/download/\ v{{ nginx_exporter_version.tag }}/nginx-prometheus-exporter_{{ nginx_exporter_version.tag }}\ diff --git a/roles/node_exporter/tasks/main.yml b/roles/node_exporter/tasks/main.yml index 1a1d8f0..ce8659c 100644 --- a/roles/node_exporter/tasks/main.yml +++ b/roles/node_exporter/tasks/main.yml @@ -41,7 +41,7 @@ architecture_alias: "arm64" # noqa: var-naming[no-role-prefix] when: ansible_architecture == "aarch64" -- name: "Download node_exporter from GitHub (v{{ node_exporter_version.tag }})" +- name: "Download node_exporter from GitHub" get_url: url: "https://github.com/prometheus/node_exporter/releases/download/\ v{{ node_exporter_version.tag }}/node_exporter-{{ node_exporter_version.tag }}\ diff --git a/roles/php/tasks/main.yml b/roles/php/tasks/main.yml index 0d20352..67f6106 100644 --- a/roles/php/tasks/main.yml +++ b/roles/php/tasks/main.yml @@ -1,8 +1,14 @@ --- +# - name: Add Sury PHP GPG apt key +# apt_key: +# url: https://packages.sury.org/php/apt.gpg +# keyring: /usr/share/keyrings/deb.sury.org-php.gpg +# state: present + - name: Add Sury PHP Repository command: add-apt-repository -y ppa:ondrej/php args: - creates: "/etc/apt/sources.list.d/ondrej-ubuntu-php-jammy.list" + creates: "/etc/apt/sources.list.d/ondrej-ubuntu-php-{{ ansible_distribution_release }}.sources" when: php_version is defined # add repo when version is specified, otherwise use default repo - name: Uninstall old PHP version @@ -12,6 +18,10 @@ purge: true when: php_old_version is defined # uninstall when old version is specified +# - name: Print php_modules list +# debug: +# msg: "{{ ['php' + php_version] | product(php_modules) | map('join', '-') | list }}" + - name: "Install custom PHP modules {{ php_modules }}" apt: name: "{{ ['php' + php_version] | product(php_modules) | map('join', '-') | list }}" diff --git a/roles/php_fpm_exporter/tasks/main.yml b/roles/php_fpm_exporter/tasks/main.yml index e939810..a2c1b9c 100644 --- a/roles/php_fpm_exporter/tasks/main.yml +++ b/roles/php_fpm_exporter/tasks/main.yml @@ -30,7 +30,7 @@ architecture_alias: "arm64" # noqa: var-naming[no-role-prefix] when: ansible_architecture == "aarch64" -- name: "Download php_fpm_exporter from GitHub (v{{ php_fpm_exporter_version.tag }})" +- name: "Download php_fpm_exporter from GitHub" get_url: url: "https://github.com/hipages/php-fpm_exporter/releases/download/\ v{{ php_fpm_exporter_version.tag }}/php-fpm_exporter_{{ php_fpm_exporter_version.tag }}\ diff --git a/roles/postgresql/tasks/postgres_exporter.yml b/roles/postgresql/tasks/postgres_exporter.yml index 63fae46..f989872 100644 --- a/roles/postgresql/tasks/postgres_exporter.yml +++ b/roles/postgresql/tasks/postgres_exporter.yml @@ -24,7 +24,7 @@ architecture_alias: "arm64" # noqa: var-naming[no-role-prefix] when: ansible_architecture == "aarch64" -- name: "Download postgres_exporter from GitHub (v{{ postgresql_exporter_version.tag }})" +- name: "Download postgres_exporter from GitHub" get_url: url: "https://github.com/prometheus-community/postgres_exporter/releases/download/\ v{{ postgresql_exporter_version.tag }}/postgres_exporter-{{ postgresql_exporter_version.tag }}\ diff --git a/roles/systemd_exporter/tasks/main.yml b/roles/systemd_exporter/tasks/main.yml index bc20dda..0eb1b86 100644 --- a/roles/systemd_exporter/tasks/main.yml +++ b/roles/systemd_exporter/tasks/main.yml @@ -24,7 +24,7 @@ architecture_alias: "arm64" # noqa: var-naming[no-role-prefix] when: ansible_architecture == "aarch64" -- name: "Download systemd_exporter from GitHub (v{{ systemd_exporter_version.tag }})" +- name: "Download systemd_exporter from GitHub" get_url: url: "https://github.com/povilasv/systemd_exporter/releases/download/\ v{{ systemd_exporter_version.tag }}/systemd_exporter-{{ systemd_exporter_version.tag }}\