From 3e747a10694609e7ba84a5f705c5d0802763c3f4 Mon Sep 17 00:00:00 2001 From: Oli Date: Thu, 27 Jul 2023 23:27:11 +0000 Subject: [PATCH] ansible-lint recommendations --- roles/lego/handlers/main.yml | 4 +-- roles/lego/tasks/main.yml | 6 ++-- roles/mariadb/handlers/main.yml | 6 ++-- roles/mariadb/tasks/mariadb.yml | 2 +- roles/mariadb/tasks/mysqld_exporter.yml | 8 ++--- roles/nextcloud/handlers/main.yml | 12 ++++---- roles/nextcloud/tasks/configure.yml | 29 ++++++++++--------- roles/nextcloud/tasks/dependencies.yml | 2 +- roles/nextcloud/tasks/nextcloud.yml | 6 ++-- roles/nextcloud/tasks/rclone.yml | 2 +- .../templates/nextcloud.config.json.j2 | 4 +-- .../rclone_mount_nextcloud.service.j2 | 4 +-- roles/nextcloud/vars/main.yml | 4 +-- roles/nginx/handlers/main.yml | 2 +- roles/nginx/tasks/main.yml | 4 +-- roles/node_exporter/handlers/main.yml | 2 +- roles/node_exporter/tasks/main.yml | 8 ++--- roles/php/handlers/main.yml | 2 +- roles/php/tasks/main.yml | 2 +- roles/postgresql/handlers/main.yml | 6 ++-- roles/postgresql/tasks/postgres_exporter.yml | 8 ++--- roles/postgresql/tasks/postgresql.yml | 4 +-- roles/rclone/tasks/main.yml | 8 ++--- roles/redis/handlers/main.yml | 2 +- roles/redis/tasks/main.yml | 2 +- roles/systemd_exporter/handlers/main.yml | 2 +- roles/systemd_exporter/tasks/main.yml | 8 ++--- roles/webserver/handlers/main.yml | 4 +-- roles/webserver/tasks/nginx.yml | 8 ++--- roles/webserver/tasks/php.yml | 6 ++-- roles/webserver/tasks/volume.yml | 4 +-- 31 files changed, 87 insertions(+), 84 deletions(-) diff --git a/roles/lego/handlers/main.yml b/roles/lego/handlers/main.yml index 97d7925..ff75f5b 100644 --- a/roles/lego/handlers/main.yml +++ b/roles/lego/handlers/main.yml @@ -1,12 +1,12 @@ --- -- name: restart lego_timer +- name: Restart lego_timer systemd: daemon_reload: true enabled: true name: lego.timer state: restarted -- name: restart lego_service +- name: Restart lego_service systemd: daemon_reload: true enabled: true diff --git a/roles/lego/tasks/main.yml b/roles/lego/tasks/main.yml index 16b79c6..3c3fd16 100644 --- a/roles/lego/tasks/main.yml +++ b/roles/lego/tasks/main.yml @@ -15,8 +15,8 @@ {{ lego_version.tag }}/lego_{{ lego_version.tag }}\ _linux_{{ deb_architecture }}.tar.gz" dest: "/var/tmp/lego.tar.gz" - register: _download_archive - until: _download_archive is succeeded + register: lego_download_archive + until: lego_download_archive is succeeded retries: 3 delay: 5 @@ -59,4 +59,4 @@ dest: "/etc/systemd/system/{{ item }}" mode: "0644" loop: [lego.service, lego.timer] - notify: [restart lego_service, restart lego_timer] + notify: [Restart lego_service, Restart lego_timer] diff --git a/roles/mariadb/handlers/main.yml b/roles/mariadb/handlers/main.yml index c94f649..64d485d 100644 --- a/roles/mariadb/handlers/main.yml +++ b/roles/mariadb/handlers/main.yml @@ -1,15 +1,15 @@ --- -- name: restart mariadb +- name: Restart mariadb systemd: name: mariadb.service state: restarted -- name: reload mariadb +- name: Reload mariadb systemd: name: mariadb.service state: reloaded -- name: restart mysqld_exporter +- name: Restart mysqld_exporter systemd: daemon_reload: true enabled: true diff --git a/roles/mariadb/tasks/mariadb.yml b/roles/mariadb/tasks/mariadb.yml index fc0ed84..44bacad 100644 --- a/roles/mariadb/tasks/mariadb.yml +++ b/roles/mariadb/tasks/mariadb.yml @@ -33,4 +33,4 @@ owner: mysql group: mysql mode: "0600" - notify: restart mariadb + notify: Restart mariadb diff --git a/roles/mariadb/tasks/mysqld_exporter.yml b/roles/mariadb/tasks/mysqld_exporter.yml index 0a0a5b1..aa8bf56 100644 --- a/roles/mariadb/tasks/mysqld_exporter.yml +++ b/roles/mariadb/tasks/mysqld_exporter.yml @@ -20,8 +20,8 @@ v{{ mysqld_exporter_version.tag }}/mysqld_exporter-{{ mysqld_exporter_version.tag }}\ .linux-{{ deb_architecture }}.tar.gz" dest: "/var/tmp/mysqld_exporter.tar.gz" - register: _download_archive - until: _download_archive is succeeded + register: mysqld_exporter_download_archive + until: mysqld_exporter_download_archive is succeeded retries: 3 delay: 5 @@ -36,7 +36,7 @@ --strip-components=1 include: - "mysqld_exporter-{{ mysqld_exporter_version.tag }}.linux-{{ deb_architecture }}/mysqld_exporter" - notify: restart mysqld_exporter + notify: Restart mysqld_exporter - name: Copy the mysqld_exporter systemd service file template: @@ -45,4 +45,4 @@ owner: root group: root mode: "0644" - notify: restart mysqld_exporter + notify: Restart mysqld_exporter diff --git a/roles/nextcloud/handlers/main.yml b/roles/nextcloud/handlers/main.yml index e791b1a..7ede2f6 100644 --- a/roles/nextcloud/handlers/main.yml +++ b/roles/nextcloud/handlers/main.yml @@ -1,13 +1,13 @@ --- -- name: restart rclone_mount_nextcloud +- name: Restart rclone_mount_nextcloud systemd: daemon_reload: true enabled: true name: rclone_mount_nextcloud.service state: restarted -- name: restart nextcloudcron +- name: Restart nextcloudcron systemd: daemon_reload: true enabled: true @@ -15,28 +15,28 @@ state: restarted loop: [nextcloudcron.service, nextcloudcron.timer] -- name: restart nextcloud_nightlycron +- name: Restart nextcloud_nightlycron systemd: daemon_reload: true enabled: true name: nextcloud_nightlycron.timer state: restarted -- name: restart nextcloud_notify_push +- name: Restart nextcloud_notify_push systemd: daemon_reload: true enabled: true name: nextcloud_notify_push.service state: restarted -- name: restart nextcloud_exporter +- name: Restart nextcloud_exporter systemd: daemon_reload: true enabled: true name: nextcloud_exporter.service state: restarted -- name: restart nextcloud_backup_timer +- name: Restart nextcloud_backup_timer systemd: daemon_reload: true enabled: true diff --git a/roles/nextcloud/tasks/configure.yml b/roles/nextcloud/tasks/configure.yml index 804f939..1928df8 100644 --- a/roles/nextcloud/tasks/configure.yml +++ b/roles/nextcloud/tasks/configure.yml @@ -54,16 +54,19 @@ v{{ nextcloud_exporter_version.tag }}/nextcloud-exporter-{{ nextcloud_exporter_version.tag }}\ -{{ deb_architecture }}.bz2" dest: "/var/tmp/nextcloud-exporter.bz2" - register: _download_archive - until: _download_archive is succeeded + register: nextcloud_exporter_download_archive + until: nextcloud_exporter_download_archive is succeeded retries: 3 delay: 5 -- name: decompress nextcloud_exporter +- name: Decompress nextcloud_exporter command: cmd: "bzip2 -dk nextcloud-exporter.bz2" - chdir: /var/tmp - creates: /var/tmp/nextcloud-exporter + args: + chdir: /var/tmp/ + register: nextcloud_exporter_decompress_archive + changed_when: nextcloud_exporter_decompress_archive.rc != 0 + when: nextcloud_exporter_download_archive.changed # noqa: no-handler - name: Copy nextcloud_exporter copy: @@ -73,7 +76,7 @@ owner: "{{ nextcloud_exporter_system_user }}" group: "{{ nextcloud_exporter_system_group }}" mode: "0755" - notify: restart nextcloud_exporter + notify: Restart nextcloud_exporter - name: Get latest nextcloud_notify_push version github_release: @@ -91,12 +94,12 @@ - name: "set deb_architecture alias" set_fact: - deb_architecture_alias: "x86_64" + deb_architecture_alias: "x86_64" # noqa: var-naming[no-role-prefix] when: deb_architecture == "amd64" - name: "set deb_architecture alias" set_fact: - deb_architecture_alias: "{{ deb_architecture }}" + deb_architecture_alias: "{{ deb_architecture }}" # noqa: var-naming[no-role-prefix] when: deb_architecture != "amd64" - name: Download nextcloud_notify_push {{ nextcloud_notify_push_version.tag }} from GitHub @@ -104,8 +107,8 @@ url: "https://github.com/nextcloud/notify_push/releases/download/v{{ nextcloud_notify_push_version.tag }}\ /notify_push-{{ deb_architecture_alias }}-unknown-linux-musl" dest: "/var/tmp/notify_push-{{ deb_architecture_alias }}-unknown-linux-musl" - register: _download_archive - until: _download_archive is succeeded + register: nextcloud_notify_push_download_archive + until: nextcloud_notify_push_download_archive is succeeded retries: 3 delay: 5 @@ -117,7 +120,7 @@ owner: "{{ webserver_user }}" group: "{{ webserver_group }}" mode: "0700" - notify: restart nextcloud_notify_push + notify: Restart nextcloud_notify_push - name: Copy nextcloud_nightlycron template: @@ -142,8 +145,8 @@ - nextcloud_nightlycron.service - nextcloud_nightlycron.timer notify: - - restart {{ item | regex_replace ('\..*', '') }} - - restart systemd_exporter + - Restart {{ item | regex_replace ('\..*', '') }} + - Restart systemd_exporter - name: Copy Nextcloud logrotate file template: diff --git a/roles/nextcloud/tasks/dependencies.yml b/roles/nextcloud/tasks/dependencies.yml index 605fbe6..2e4ade1 100644 --- a/roles/nextcloud/tasks/dependencies.yml +++ b/roles/nextcloud/tasks/dependencies.yml @@ -16,7 +16,7 @@ lineinfile: path: /etc/php/{{ php_version }}/cli/conf.d/20-apcu.ini line: apc.enable_cli=1 - notify: restart php-fpm + notify: Restart php-fpm - name: "Add {{ webserver_user }} user to redis group" user: diff --git a/roles/nextcloud/tasks/nextcloud.yml b/roles/nextcloud/tasks/nextcloud.yml index b9dc0f9..6793685 100644 --- a/roles/nextcloud/tasks/nextcloud.yml +++ b/roles/nextcloud/tasks/nextcloud.yml @@ -1,5 +1,5 @@ --- -# flush handlers to restart code-server before install extensions +# flush handlers to Restart code-server before install extensions - name: Flush handlers befor continue meta: flush_handlers @@ -23,8 +23,8 @@ get_url: url: "https://download.nextcloud.com/server/releases/latest.tar.bz2" dest: "/var/tmp/nextcloud.tar.gz" - register: _download_archive - until: _download_archive is succeeded + register: nextcloud_download_archive + until: nextcloud_download_archive is succeeded retries: 3 delay: 5 diff --git a/roles/nextcloud/tasks/rclone.yml b/roles/nextcloud/tasks/rclone.yml index 00397e7..6840527 100644 --- a/roles/nextcloud/tasks/rclone.yml +++ b/roles/nextcloud/tasks/rclone.yml @@ -21,7 +21,7 @@ src: rclone_mount_nextcloud.service.j2 dest: /etc/systemd/system/rclone_mount_nextcloud.service mode: "0640" - notify: restart rclone_mount_nextcloud + notify: Restart rclone_mount_nextcloud - name: "Add {{ webserver_user }} user to rclone group" user: diff --git a/roles/nextcloud/templates/nextcloud.config.json.j2 b/roles/nextcloud/templates/nextcloud.config.json.j2 index 7fc2a46..477bf0a 100644 --- a/roles/nextcloud/templates/nextcloud.config.json.j2 +++ b/roles/nextcloud/templates/nextcloud.config.json.j2 @@ -25,8 +25,8 @@ "mail_sendmailmode": "smtp", "mail_domain": "{{ nextcloud_smtp_from_domain }}", "mail_smtpauth": 1, - "mail_smtpname": "{{ nextcloud_smtp_user }}", - "mail_smtppassword": "{{ nextcloud_smtp_pass }}", + "mail_smtpname": "{{ vault_nextcloud_smtp_user }}", + "mail_smtppassword": "{{ vault_nextcloud_smtp_pass }}", "mail_smtpsecure": "tls", "loglevel": 1, "logfile": {{ nextcloud_log_file | to_json }}, diff --git a/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2 b/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2 index 4cac184..f164b9e 100644 --- a/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2 +++ b/roles/nextcloud/templates/rclone_mount_nextcloud.service.j2 @@ -13,8 +13,8 @@ ExecStart=/usr/bin/rclone mount DTSV_crypt:cloud_data {{ nextcloud_rclone_mount_ --use-mmap \ --default-permissions \ --allow-other \ - --uid {{ created_rclone_user.uid }} \ - --gid {{ created_rclone_group.gid }} \ + --uid {{ rclone_created_user.uid }} \ + --gid {{ rclone_created_group.gid }} \ --umask 0007 \ --dir-perms 0770 \ --file-perms 0660 \ diff --git a/roles/nextcloud/vars/main.yml b/roles/nextcloud/vars/main.yml index 5b1895c..7d39d1b 100644 --- a/roles/nextcloud/vars/main.yml +++ b/roles/nextcloud/vars/main.yml @@ -43,14 +43,14 @@ nextcloud_smtp_host: "{{ smtp_hostname }}" nextcloud_smtp_port: "{{ smtp_port }}" nextcloud_smtp_from_address: "cloud" nextcloud_smtp_from_domain: "twirling.de" -nextcloud_smtp_user: !vault | +vault_nextcloud_smtp_user: !vault | $ANSIBLE_VAULT;1.2;AES256;dtsv-dev 37323762356630343133346634653965303530363966646236383962313163623637326165346439 3234303935353134633238396365363036313363663031310a663339363665376564306565393538 33663566663534383133623965316362383731303565326632623430303565343134393939343734 3930376165653536310a656632373336623663356431333136303165653162333137626632333033 35363439346237666662333537613363386266653865656238323638666533356535 -nextcloud_smtp_pass: !vault | +vault_nextcloud_smtp_pass: !vault | $ANSIBLE_VAULT;1.2;AES256;dtsv-dev 61303737376466646164313766373639376133633935313433356637323038626437663736363631 3864616433353737666137663663666333366463626337630a643034323935613833633439306236 diff --git a/roles/nginx/handlers/main.yml b/roles/nginx/handlers/main.yml index 715758d..2cbdc68 100644 --- a/roles/nginx/handlers/main.yml +++ b/roles/nginx/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: reload nginx +- name: Reload nginx systemd: name: nginx.service state: reloaded diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index 9d5f784..0afc16f 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -35,10 +35,10 @@ dest: /etc/nginx/global/ssl.conf src: ssl.conf.j2 mode: "0644" - notify: reload nginx + notify: Reload nginx - name: Download pre-defined DHE group # as recommended by IETF RFC 7919 get_url: url: https://github.com/internetstandards/dhe_groups/raw/main/ffdhe4096.pem dest: "{{ nginx_ssl_dhparam }}" - notify: reload nginx + notify: Reload nginx diff --git a/roles/node_exporter/handlers/main.yml b/roles/node_exporter/handlers/main.yml index 671c3e7..2c01d54 100644 --- a/roles/node_exporter/handlers/main.yml +++ b/roles/node_exporter/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: restart node_exporter +- name: Restart node_exporter systemd: daemon_reload: true enabled: true diff --git a/roles/node_exporter/tasks/main.yml b/roles/node_exporter/tasks/main.yml index b3d63c5..2407ea4 100644 --- a/roles/node_exporter/tasks/main.yml +++ b/roles/node_exporter/tasks/main.yml @@ -37,8 +37,8 @@ v{{ node_exporter_version.tag }}/node_exporter-{{ node_exporter_version.tag }}\ .linux-{{ deb_architecture }}.tar.gz" dest: "/var/tmp/node_exporter.tar.gz" - register: _download_archive - until: _download_archive is succeeded + register: node_exporter_download_archive + until: node_exporter_download_archive is succeeded retries: 3 delay: 5 @@ -53,7 +53,7 @@ - --strip-components=1 include: - "node_exporter-{{ node_exporter_version.tag }}.linux-{{ deb_architecture }}/node_exporter" - notify: restart node_exporter + notify: Restart node_exporter - name: Copy node_exporter systemd service template: @@ -62,4 +62,4 @@ owner: root group: root mode: "0644" - notify: restart node_exporter + notify: Restart node_exporter diff --git a/roles/php/handlers/main.yml b/roles/php/handlers/main.yml index afe0251..538fd65 100644 --- a/roles/php/handlers/main.yml +++ b/roles/php/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: restart php-fpm +- name: Restart php-fpm systemd: name: php{{ php_version }}-fpm.service state: reloaded diff --git a/roles/php/tasks/main.yml b/roles/php/tasks/main.yml index e40ac1e..10c2e93 100644 --- a/roles/php/tasks/main.yml +++ b/roles/php/tasks/main.yml @@ -25,4 +25,4 @@ src: php-handler.conf.j2 mode: "0644" when: '"fpm" in php_modules' - notify: reload nginx + notify: Reload nginx diff --git a/roles/postgresql/handlers/main.yml b/roles/postgresql/handlers/main.yml index ab1582d..631608a 100644 --- a/roles/postgresql/handlers/main.yml +++ b/roles/postgresql/handlers/main.yml @@ -1,15 +1,15 @@ --- -- name: restart postgresql +- name: Restart postgresql systemd: name: postgresql.service state: restarted -- name: reload postgresql +- name: Reload postgresql systemd: name: postgresql.service state: reloaded -- name: restart postgres_exporter +- name: Restart postgres_exporter systemd: daemon_reload: true enabled: true diff --git a/roles/postgresql/tasks/postgres_exporter.yml b/roles/postgresql/tasks/postgres_exporter.yml index 34358fe..0978c7d 100644 --- a/roles/postgresql/tasks/postgres_exporter.yml +++ b/roles/postgresql/tasks/postgres_exporter.yml @@ -20,8 +20,8 @@ v{{ postgres_exporter_version.tag }}/postgres_exporter-{{ postgres_exporter_version.tag }}\ .linux-{{ deb_architecture }}.tar.gz" dest: "/var/tmp/postgres_exporter.tar.gz" - register: _download_archive - until: _download_archive is succeeded + register: postgres_exporter_download_archive + until: postgres_exporter_download_archive is succeeded retries: 3 delay: 5 @@ -36,7 +36,7 @@ --strip-components=1 include: - "postgres_exporter-{{ postgres_exporter_version.tag }}.linux-{{ deb_architecture }}/postgres_exporter" - notify: restart postgres_exporter + notify: Restart postgres_exporter - name: Copy the postgres_exporter systemd service file template: @@ -45,4 +45,4 @@ owner: root group: root mode: "0644" - notify: restart postgres_exporter + notify: Restart postgres_exporter diff --git a/roles/postgresql/tasks/postgresql.yml b/roles/postgresql/tasks/postgresql.yml index 8b4254c..b4d76af 100644 --- a/roles/postgresql/tasks/postgresql.yml +++ b/roles/postgresql/tasks/postgresql.yml @@ -33,7 +33,7 @@ become_user: postgres register: postgresql_set loop: "{{ pgsql_config }}" - notify: restart postgresql + notify: Restart postgresql - name: Set PostgreSQL Client Authentication community.postgresql.postgresql_pg_hba: @@ -46,4 +46,4 @@ contype: host # custom rules rules: "{{ pgsql_client_auth }}" - notify: reload postgresql + notify: Reload postgresql diff --git a/roles/rclone/tasks/main.yml b/roles/rclone/tasks/main.yml index b8ae542..d3a0a29 100644 --- a/roles/rclone/tasks/main.yml +++ b/roles/rclone/tasks/main.yml @@ -19,8 +19,8 @@ url: "https://downloads.rclone.org/v{{ rclone_version }}/\ rclone-v{{ rclone_version }}-linux-{{ deb_architecture }}.deb" dest: "/var/tmp/rclone.deb" - register: _download_deb - until: _download_deb is succeeded + register: rclone_download_deb + until: rclone_download_deb is succeeded retries: 3 delay: 5 @@ -45,7 +45,7 @@ name: "{{ rclone_system_group }}" state: present system: true - register: created_rclone_group + register: rclone_created_group when: rclone_system_group != "root" - name: Create rclone user @@ -58,7 +58,7 @@ system: true create_home: false home: / - register: created_rclone_user + register: rclone_created_user - name: adding existing user {{ main_user }} to group rclone user: diff --git a/roles/redis/handlers/main.yml b/roles/redis/handlers/main.yml index a8c08cc..aa7c0f0 100644 --- a/roles/redis/handlers/main.yml +++ b/roles/redis/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: restart redis +- name: Restart redis systemd: name: redis-server.service state: restarted diff --git a/roles/redis/tasks/main.yml b/roles/redis/tasks/main.yml index ee5c432..4e5667c 100644 --- a/roles/redis/tasks/main.yml +++ b/roles/redis/tasks/main.yml @@ -11,4 +11,4 @@ owner: redis group: redis mode: "0640" - notify: restart redis + notify: Restart redis diff --git a/roles/systemd_exporter/handlers/main.yml b/roles/systemd_exporter/handlers/main.yml index c25aafd..ffd5128 100644 --- a/roles/systemd_exporter/handlers/main.yml +++ b/roles/systemd_exporter/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: restart systemd_exporter +- name: Restart systemd_exporter systemd: daemon_reload: true enabled: true diff --git a/roles/systemd_exporter/tasks/main.yml b/roles/systemd_exporter/tasks/main.yml index 0bd7ecb..b073ccd 100644 --- a/roles/systemd_exporter/tasks/main.yml +++ b/roles/systemd_exporter/tasks/main.yml @@ -20,8 +20,8 @@ v{{ systemd_exporter_version.tag }}/systemd_exporter-{{ systemd_exporter_version.tag }}\ .linux-{{ deb_architecture }}.tar.gz" dest: "/var/tmp/systemd_exporter.tar.gz" - register: _download_archive - until: _download_archive is succeeded + register: systemd_exporter_download_archive + until: systemd_exporter_download_archive is succeeded retries: 3 delay: 5 @@ -36,7 +36,7 @@ - --strip-components=1 include: - "systemd_exporter-{{ systemd_exporter_version.tag }}.linux-{{ deb_architecture }}/systemd_exporter" - notify: restart systemd_exporter + notify: Restart systemd_exporter - name: Copy the systemd_exporter systemd service file template: @@ -45,4 +45,4 @@ owner: root group: root mode: "0644" - notify: restart systemd_exporter + notify: Restart systemd_exporter diff --git a/roles/webserver/handlers/main.yml b/roles/webserver/handlers/main.yml index 7bbfd09..446e2ff 100644 --- a/roles/webserver/handlers/main.yml +++ b/roles/webserver/handlers/main.yml @@ -1,10 +1,10 @@ --- -- name: reload nginx +- name: Reload nginx systemd: name: nginx.service state: reloaded -- name: restart nginx +- name: Restart nginx systemd: name: nginx.service daemon_reload: true diff --git a/roles/webserver/tasks/nginx.yml b/roles/webserver/tasks/nginx.yml index 51a3285..8b47c7b 100644 --- a/roles/webserver/tasks/nginx.yml +++ b/roles/webserver/tasks/nginx.yml @@ -11,7 +11,7 @@ - {src: "header.conf.j2", dest: "/etc/nginx/global/header.conf"} - {src: "proxy.conf.j2", dest: "/etc/nginx/global/proxy.conf"} - {src: "php_optimization.j2", dest: "/etc/nginx/global/php_optimization"} - notify: reload nginx + notify: Reload nginx - name: Copy virtual server configs template: @@ -19,7 +19,7 @@ dest: /etc/nginx/conf.d/{{ item | basename | regex_replace('\.j2$', '') }} mode: "0644" with_fileglob: "../templates/conf.d/*.j2" - notify: reload nginx + notify: Reload nginx ## Certificates @@ -39,7 +39,7 @@ group: root mode: "0600" loop: [crt, key, issuer.crt] - notify: reload nginx + notify: Reload nginx - name: Create nginx.service.d directory file: @@ -52,4 +52,4 @@ src: nginx_systemd.conf.j2 dest: /etc/systemd/system/nginx.service.d/nginx.conf mode: "0644" - notify: restart nginx + notify: Restart nginx diff --git a/roles/webserver/tasks/php.yml b/roles/webserver/tasks/php.yml index b1c8ca4..bd1314a 100644 --- a/roles/webserver/tasks/php.yml +++ b/roles/webserver/tasks/php.yml @@ -9,7 +9,7 @@ state: "{{ item.state | default('present') }}" loop: "{{ php_fpm_ini_options }}" when: '"fpm" in php_modules' - notify: restart php-fpm + notify: Restart php-fpm - name: Configure FPM pool lineinfile: @@ -18,7 +18,7 @@ line: '{{ item.option }} = {{ item.value }}' loop: "{{ php_fpm_pool_options }}" when: '"fpm" in php_modules' - notify: restart php-fpm + notify: Restart php-fpm - name: Configure FPM environment variables replace: @@ -29,7 +29,7 @@ - {regexp: ";env", replace: "env"} - {regexp: ";clear_env", replace: "clear_env"} when: '"fpm" in php_modules' - notify: restart php-fpm + notify: Restart php-fpm - name: Install imagemagick package apt: diff --git a/roles/webserver/tasks/volume.yml b/roles/webserver/tasks/volume.yml index 71dea40..ba8fade 100644 --- a/roles/webserver/tasks/volume.yml +++ b/roles/webserver/tasks/volume.yml @@ -5,7 +5,7 @@ api_token: "{{ vault_hcloud_token }}" name: "{{ hcloud_webserver_volume_name }}" delegate_to: localhost - register: web_hcloud_volume + register: webserver_hcloud_volume_info - name: Creates mount directory file: @@ -16,7 +16,7 @@ - name: Mount hcloud volume ansible.posix.mount: path: "{{ hcloud_webserver_volume_path }}" - src: "{{ web_hcloud_volume.hcloud_volume_info[0].linux_device }}" + src: "{{ webserver_hcloud_volume_info.hcloud_volume_info[0].linux_device }}" fstype: ext4 opts: discard,nofail,defaults state: mounted