From 9e16f39b59069e752bbd24f5408e39e8ac24ec79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Gon=C3=A7alves?= Date: Sat, 17 Dec 2022 18:03:39 +0100 Subject: refactor(roles): force byte conversion by ansible --- roles/_workstation/apm/tasks/main.yml | 4 ++-- roles/_workstation/doas/tasks/main.yml | 2 +- roles/_workstation/dockerd/tasks/main.yml | 4 ++-- roles/_workstation/hosts/tasks/main.yml | 2 +- roles/_workstation/kernel/tasks/main.yml | 2 +- roles/_workstation/wscons/tasks/main.yml | 2 +- roles/_workstation/xorg/tasks/main.yml | 4 ++-- roles/acme/tasks/main.yml | 2 +- roles/cgit/tasks/dependencies.yml | 2 +- roles/cgit/tasks/main.yml | 6 +++--- roles/git/tasks/main.yml | 4 ++-- roles/grafana/tasks/main.yml | 6 +++--- roles/httpd/tasks/main.yml | 2 +- roles/httpd_pre/tasks/main.yml | 4 ++-- roles/httpd_site_healthcheck/tasks/main.yml | 6 +++--- roles/loki/tasks/main.yml | 2 +- roles/miniflux/tasks/main.yml | 2 +- roles/nfsclient/tasks/main.yml | 2 +- roles/nfsd/tasks/main.yml | 6 +++--- roles/pf/tasks/main.yml | 2 +- roles/postgres/tasks/main.yml | 4 ++-- roles/prometheus/tasks/main.yml | 2 +- roles/rc/tasks/main.yml | 2 +- roles/relayd/tasks/main.yml | 2 +- roles/vmm/tasks/autoinstall_configuration.yml | 6 +++--- roles/vmm/tasks/iso.yml | 2 +- roles/vmm/tasks/main.yml | 4 ++-- roles/vmm/tasks/network.yml | 4 ++-- roles/wireguard/tasks/configuration.yml | 4 ++-- roles/wireguard/tasks/main.yml | 4 ++-- roles/wireguard/tasks/service.yml | 2 +- 31 files changed, 51 insertions(+), 51 deletions(-) (limited to 'roles') diff --git a/roles/_workstation/apm/tasks/main.yml b/roles/_workstation/apm/tasks/main.yml index 72c5d2a..f2f9ebf 100644 --- a/roles/_workstation/apm/tasks/main.yml +++ b/roles/_workstation/apm/tasks/main.yml @@ -6,13 +6,13 @@ state: directory owner: 0 group: 0 - mode: 0755 + mode: "0755" - name: copy apm configurations ansible.builtin.copy: src: "{{ item }}" dest: "{{ apm_configuration_dir }}/{{ item }}" - mode: 0755 + mode: "0755" owner: 0 group: 0 loop: diff --git a/roles/_workstation/doas/tasks/main.yml b/roles/_workstation/doas/tasks/main.yml index be61f74..4f22fe5 100644 --- a/roles/_workstation/doas/tasks/main.yml +++ b/roles/_workstation/doas/tasks/main.yml @@ -6,7 +6,7 @@ regexp: "^permit persist keepenv {{ doas_workstation_user }} as root" line: "permit persist keepenv {{ doas_workstation_user }} as root" create: true - mode: 0644 + mode: "0644" owner: 0 group: 0 diff --git a/roles/_workstation/dockerd/tasks/main.yml b/roles/_workstation/dockerd/tasks/main.yml index a7ba92b..82b2cac 100644 --- a/roles/_workstation/dockerd/tasks/main.yml +++ b/roles/_workstation/dockerd/tasks/main.yml @@ -19,7 +19,7 @@ state: directory owner: 0 group: 0 - mode: 0755 + mode: "0755" - name: configure default network for docker containers ansible.builtin.copy: @@ -27,4 +27,4 @@ dest: "{{ dockerd_configuration_dir }}/daemon.json" owner: 0 group: 0 - mode: 0600 + mode: "0600" diff --git a/roles/_workstation/hosts/tasks/main.yml b/roles/_workstation/hosts/tasks/main.yml index 20e247e..920fbf8 100644 --- a/roles/_workstation/hosts/tasks/main.yml +++ b/roles/_workstation/hosts/tasks/main.yml @@ -4,6 +4,6 @@ ansible.builtin.get_url: url: "{{ hosts_url }}" dest: "{{ hosts_file }}" - mode: 0644 + mode: "0644" owner: 0 group: 0 diff --git a/roles/_workstation/kernel/tasks/main.yml b/roles/_workstation/kernel/tasks/main.yml index 3dc1e60..f711428 100644 --- a/roles/_workstation/kernel/tasks/main.yml +++ b/roles/_workstation/kernel/tasks/main.yml @@ -5,7 +5,7 @@ path: "{{ kernel_sysctl_configuration_file }}" owner: 0 group: 0 - mode: 0644 + mode: "0644" - name: apply memory optimizations ansible.builtin.blockinfile: diff --git a/roles/_workstation/wscons/tasks/main.yml b/roles/_workstation/wscons/tasks/main.yml index e07b7fa..67296f0 100644 --- a/roles/_workstation/wscons/tasks/main.yml +++ b/roles/_workstation/wscons/tasks/main.yml @@ -8,7 +8,7 @@ create: true owner: 0 group: 0 - mode: 0644 + mode: "0644" loop: - [screen.brightness, 80] - [keyboard.repeat.del1, 180] diff --git a/roles/_workstation/xorg/tasks/main.yml b/roles/_workstation/xorg/tasks/main.yml index f07daba..ed183a7 100644 --- a/roles/_workstation/xorg/tasks/main.yml +++ b/roles/_workstation/xorg/tasks/main.yml @@ -17,13 +17,13 @@ path: "{{ xorg_configuration_dir }}" owner: 0 group: 0 - mode: 0644 + mode: "0644" state: directory - name: copy xorg configuration ansible.builtin.copy: src: intel.conf dest: "{{ xorg_configuration_dir }}/" - mode: 0644 + mode: "0644" owner: 0 group: 0 diff --git a/roles/acme/tasks/main.yml b/roles/acme/tasks/main.yml index 6d55599..5f0f560 100644 --- a/roles/acme/tasks/main.yml +++ b/roles/acme/tasks/main.yml @@ -6,7 +6,7 @@ dest: "{{ acme_configuration_file }}" owner: 0 group: 0 - mode: 0644 + mode: "0644" - name: retrieve enabled domains # noqa: no-changed-when ansible.builtin.shell: | diff --git a/roles/cgit/tasks/dependencies.yml b/roles/cgit/tasks/dependencies.yml index 5a74d45..a0d4d65 100644 --- a/roles/cgit/tasks/dependencies.yml +++ b/roles/cgit/tasks/dependencies.yml @@ -11,7 +11,7 @@ path: "{{ cgit_chroot_dir }}{{ item | dirname }}" owner: 0 group: 0 - mode: 0755 + mode: "0755" state: directory loop: "{{ result.stdout_lines }}" diff --git a/roles/cgit/tasks/main.yml b/roles/cgit/tasks/main.yml index 34e394c..272b199 100644 --- a/roles/cgit/tasks/main.yml +++ b/roles/cgit/tasks/main.yml @@ -12,7 +12,7 @@ path: "{{ cgit_chroot_dir }}/cache/cgit" owner: www group: www - mode: 0750 + mode: "0750" state: directory - name: generate cgit configuration files @@ -21,7 +21,7 @@ dest: "{{ item.file }}" owner: 0 group: 0 - mode: 0644 + mode: "0644" loop: - ansible.builtin.template: cgitrc.j2 file: "{{ cgit_chroot_dir }}/conf/cgitrc" @@ -39,7 +39,7 @@ dest: "{{ cgit_chroot_dir }}/bin/about-filter.sh" owner: 0 group: 0 - mode: 0755 + mode: "0755" - name: start and enable slowcgi service ansible.builtin.service: diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 28c1cbf..5ad8c98 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -24,7 +24,7 @@ owner: "{{ git_user }}" group: "{{ git_group }}" state: directory - mode: 0755 + mode: "0755" loop: - "{{ git_dir }}" - "{{ git_dir }}/git-shell-commands" @@ -44,7 +44,7 @@ dest: "{{ git_dir }}/.gitconfig" owner: "{{ git_user }}" group: "{{ git_group }}" - mode: 0644 + mode: "0644" - name: include ssh key synchronization ansible.builtin.include_role: diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index 96f3966..1044119 100644 --- a/roles/grafana/tasks/main.yml +++ b/roles/grafana/tasks/main.yml @@ -10,7 +10,7 @@ path: "{{ grafana_dir }}/{{ item }}" owner: "{{ grafana_user }}" group: "{{ grafana_group }}" - mode: 0640 + mode: "0640" state: directory loop: - "" @@ -24,7 +24,7 @@ dest: "{{ grafana_configuration_file }}" owner: 0 group: 0 - mode: 0644 + mode: "0644" - name: generate grafana data sources ansible.builtin.template: @@ -32,7 +32,7 @@ dest: /etc/grafana/provisioning/datasources/default.yml owner: "{{ grafana_user }}" group: "{{ grafana_group }}" - mode: 0640 + mode: "0640" - name: start and enable grafana service ansible.builtin.service: diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index ce4853a..f946044 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -12,7 +12,7 @@ dest: "{{ httpd_configuration_file }}" owner: 0 group: 0 - mode: 0644 + mode: "0644" - name: enable and restart httpd ansible.builtin.service: diff --git a/roles/httpd_pre/tasks/main.yml b/roles/httpd_pre/tasks/main.yml index 39cb1c7..acc6673 100644 --- a/roles/httpd_pre/tasks/main.yml +++ b/roles/httpd_pre/tasks/main.yml @@ -6,7 +6,7 @@ state: directory owner: 0 group: 0 - mode: 0644 + mode: "0644" - name: create htpasswd directory ansible.builtin.file: @@ -14,7 +14,7 @@ state: directory owner: "www" group: "www" - mode: 0700 + mode: "0700" - name: mount nfs in chroot ansible.builtin.include_role: diff --git a/roles/httpd_site_healthcheck/tasks/main.yml b/roles/httpd_site_healthcheck/tasks/main.yml index b955e02..7cb2edb 100644 --- a/roles/httpd_site_healthcheck/tasks/main.yml +++ b/roles/httpd_site_healthcheck/tasks/main.yml @@ -5,7 +5,7 @@ path: "{{ httpd_chroot }}/htdocs/healthcheck" owner: "{{ httpd_user }}" group: "{{ httpd_group }}" - mode: 0550 + mode: "0550" state: directory - name: generate generate httpd healthcheck html index @@ -14,7 +14,7 @@ dest: "{{ httpd_chroot }}/htdocs/healthcheck/index.html" owner: "{{ httpd_user }}" group: "{{ httpd_group }}" - mode: 0440 + mode: "0440" - name: generate httpd healthcheck configuration ansible.builtin.template: @@ -22,4 +22,4 @@ dest: "{{ httpd_configuration_dir }}/healthcheck.conf" owner: 0 group: 0 - mode: 0644 + mode: "0644" diff --git a/roles/loki/tasks/main.yml b/roles/loki/tasks/main.yml index 1995f12..f2659d2 100644 --- a/roles/loki/tasks/main.yml +++ b/roles/loki/tasks/main.yml @@ -11,7 +11,7 @@ dest: "{{ loki_configuration_file }}" owner: 0 group: 0 - mode: 0644 + mode: "0644" - name: generate promtail configuration ansible.builtin.template: diff --git a/roles/miniflux/tasks/main.yml b/roles/miniflux/tasks/main.yml index 91ac740..2e8003c 100644 --- a/roles/miniflux/tasks/main.yml +++ b/roles/miniflux/tasks/main.yml @@ -34,7 +34,7 @@ src: miniflux.conf.j2 dest: /etc/miniflux.conf owner: "{{ miniflux_user }}" - mode: 0640 + mode: "0640" - name: run postgres migrations # noqa: no-changed-when ansible.builtin.shell: | diff --git a/roles/nfsclient/tasks/main.yml b/roles/nfsclient/tasks/main.yml index 9f717f4..e7117dd 100644 --- a/roles/nfsclient/tasks/main.yml +++ b/roles/nfsclient/tasks/main.yml @@ -14,7 +14,7 @@ path: "{{ nfsclient_dir }}" owner: 0 group: 0 - mode: 0755 + mode: "0755" state: directory - name: cleanup fstab with previous nfs setup diff --git a/roles/nfsd/tasks/main.yml b/roles/nfsd/tasks/main.yml index 7e82a8f..9d71a10 100644 --- a/roles/nfsd/tasks/main.yml +++ b/roles/nfsd/tasks/main.yml @@ -5,7 +5,7 @@ path: "{{ nfsd_dir }}" owner: 0 group: 0 - mode: 0700 + mode: "0700" state: directory - name: create hosts directories @@ -13,7 +13,7 @@ path: "{{ nfsd_dir }}/{{ item }}" owner: 0 group: 0 - mode: 0777 + mode: "0777" state: directory loop: "{{ nfsd_shared_dirs }}" @@ -23,7 +23,7 @@ dest: /etc/exports owner: 0 group: 0 - mode: 0640 + mode: "0640" register: result - name: enable and restart portmap diff --git a/roles/pf/tasks/main.yml b/roles/pf/tasks/main.yml index fcbac06..e90e348 100644 --- a/roles/pf/tasks/main.yml +++ b/roles/pf/tasks/main.yml @@ -6,7 +6,7 @@ dest: "{{ pf_configuration_file }}" owner: 0 group: 0 - mode: 0600 + mode: "0600" notify: - lint pf configuration - enable pf diff --git a/roles/postgres/tasks/main.yml b/roles/postgres/tasks/main.yml index 302fba4..f3d24da 100644 --- a/roles/postgres/tasks/main.yml +++ b/roles/postgres/tasks/main.yml @@ -12,7 +12,7 @@ path: "{{ postgres_dir }}/{{ item }}" owner: "{{ postgres_user }}" group: "{{ postgres_group }}" - mode: 0750 + mode: "0750" state: directory loop: - "" @@ -31,7 +31,7 @@ owner: "{{ postgres_user }}" group: "{{ postgres_group }}" state: link - mode: 0750 + mode: "0750" follow: false when: postgres_dir != "/var/postgresql" diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index 956439a..27e4fda 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -13,7 +13,7 @@ dest: "{{ prometheus_configuration_file }}" owner: 0 group: 0 - mode: 0644 + mode: "0644" - name: enable and restart prometheus services ansible.builtin.service: diff --git a/roles/rc/tasks/main.yml b/roles/rc/tasks/main.yml index 3e0f0b5..642ded7 100644 --- a/roles/rc/tasks/main.yml +++ b/roles/rc/tasks/main.yml @@ -15,4 +15,4 @@ dest: "{{ rc_dir }}/{{ rc_name }}" owner: 0 group: 0 - mode: 0755 + mode: "0755" diff --git a/roles/relayd/tasks/main.yml b/roles/relayd/tasks/main.yml index 35b456d..d848da0 100644 --- a/roles/relayd/tasks/main.yml +++ b/roles/relayd/tasks/main.yml @@ -6,7 +6,7 @@ dest: "{{ relayd_configuration_file }}" owner: 0 group: 0 - mode: 0640 + mode: "0640" notify: lint relayd configuration - name: enable and restart relayd diff --git a/roles/vmm/tasks/autoinstall_configuration.yml b/roles/vmm/tasks/autoinstall_configuration.yml index 71ceb6d..4901b61 100644 --- a/roles/vmm/tasks/autoinstall_configuration.yml +++ b/roles/vmm/tasks/autoinstall_configuration.yml @@ -8,7 +8,7 @@ path: "{{ vmm_autoinstall_dir }}" owner: www group: www - mode: 0700 + mode: "0700" state: directory - name: generate autoinstall configurations @@ -17,7 +17,7 @@ dest: "{{ vmm_autoinstall_dir }}/{{ item.lladdr }}-install.conf" owner: www group: www - mode: 0640 + mode: "0640" when: item.image == "openbsd" loop: "{{ vmm_vms }}" @@ -50,7 +50,7 @@ dest: "{{ vmm_image_openbsd_kernel_prefix }}.{{ item.name }}" owner: 0 group: 0 - mode: 0600 + mode: "0600" state: hard force: true when: item.image == "openbsd" diff --git a/roles/vmm/tasks/iso.yml b/roles/vmm/tasks/iso.yml index 70ad593..a9cc38d 100644 --- a/roles/vmm/tasks/iso.yml +++ b/roles/vmm/tasks/iso.yml @@ -5,6 +5,6 @@ url: "{{ item.url }}" dest: "{{ vmm_iso_dir }}/{{ item.name }}-latest.iso" checksum: "{{ item.checksum }}" - mode: 0644 + mode: "0644" tags: task_iso loop: "{{ vmm_iso }}" diff --git a/roles/vmm/tasks/main.yml b/roles/vmm/tasks/main.yml index a7d4621..d12cadb 100644 --- a/roles/vmm/tasks/main.yml +++ b/roles/vmm/tasks/main.yml @@ -5,7 +5,7 @@ path: "{{ item }}" owner: 0 group: 0 - mode: 0770 + mode: "0770" state: directory loop: - "{{ vmm_root_dir }}" @@ -37,7 +37,7 @@ dest: "{{ vmm_configuration_file }}" owner: 0 group: 0 - mode: 0640 + mode: "0640" notify: - lint vmm configuration diff --git a/roles/vmm/tasks/network.yml b/roles/vmm/tasks/network.yml index 6846c05..b5ac4db 100644 --- a/roles/vmm/tasks/network.yml +++ b/roles/vmm/tasks/network.yml @@ -13,7 +13,7 @@ line: "net.inet.ip{{ item }}.forwarding=1" owner: 0 group: 0 - mode: 0640 + mode: "0640" create: true loop: "{{ vmm_network_forwarded_ips }}" @@ -24,7 +24,7 @@ line: *network_line owner: 0 group: 0 - mode: 0640 + mode: "0640" create: true - name: start network switch # noqa: no-changed-when diff --git a/roles/wireguard/tasks/configuration.yml b/roles/wireguard/tasks/configuration.yml index 610c191..0a2009e 100644 --- a/roles/wireguard/tasks/configuration.yml +++ b/roles/wireguard/tasks/configuration.yml @@ -4,7 +4,7 @@ ansible.builtin.template: src: wireguard.conf.j2 dest: "{{ wireguard_local_dir }}/{{ item }}.conf" - mode: 0600 + mode: "0600" vars: host: "{{ hostvars[item] }}" run_once: true @@ -17,4 +17,4 @@ dest: "{{ wireguard_dir }}/{{ wireguard_domain_controller }}.conf" owner: 0 group: 0 - mode: 0600 + mode: "0600" diff --git a/roles/wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml index 0e2343d..31b3655 100644 --- a/roles/wireguard/tasks/main.yml +++ b/roles/wireguard/tasks/main.yml @@ -4,7 +4,7 @@ ansible.builtin.file: path: "{{ wireguard_local_dir }}" state: directory - mode: 0700 + mode: "0700" run_once: true delegate_to: localhost @@ -13,7 +13,7 @@ path: "{{ wireguard_dir }}" owner: 0 group: 0 - mode: 0700 + mode: "0700" state: directory - name: include key generation diff --git a/roles/wireguard/tasks/service.yml b/roles/wireguard/tasks/service.yml index 516cee1..85849ee 100644 --- a/roles/wireguard/tasks/service.yml +++ b/roles/wireguard/tasks/service.yml @@ -7,7 +7,7 @@ line: "/usr/local/bin/wg-quick up {{ wireguard_domain_controller }}" owner: 0 create: true - mode: 0644 + mode: "0644" when: ansible_distribution == "OpenBSD" - name: restart wireguard interface -- cgit v1.2.3