style: make ansible-lint happier

This commit is contained in:
VC
2024-07-05 11:53:33 +02:00
parent a0b23684a5
commit 574982340e
11 changed files with 90 additions and 78 deletions

View File

@@ -1,6 +1,6 @@
--- ---
- name: restart nginx - name: Restart nginx
service: ansible.builtin.service:
name: nginx name: nginx
state: restarted state: restarted

View File

@@ -1,21 +1,22 @@
--- ---
- name: install nginx package - name: Install nginx package
package: ansible.builtin.package:
name: nginx-full name: nginx-full
state: present state: present
- name: create dhparam - name: Create dhparam
shell: /usr/bin/openssl dhparam -out /etc/nginx/dhparam.pem 2048 ansible.builtin.command:
args: cmd: /usr/bin/openssl dhparam -out /etc/nginx/dhparam.pem 2048
creates: /etc/nginx/dhparam.pem creates: /etc/nginx/dhparam.pem
- name: put configuration files - name: Put configuration files
template: ansible.builtin.template:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
mode: 0644
notify: notify:
- restart nginx - Restart nginx
loop: loop:
- {src: nginx.conf.j2, dest: /etc/nginx/nginx.conf} - {src: nginx.conf.j2, dest: /etc/nginx/nginx.conf}
- {src: nginx.ssl.conf.j2, dest: /etc/nginx/nginx.ssl.conf} - {src: nginx.ssl.conf.j2, dest: /etc/nginx/nginx.ssl.conf}
@@ -23,20 +24,21 @@
- {src: proxy_params.j2, dest: /etc/nginx/proxy_params} - {src: proxy_params.j2, dest: /etc/nginx/proxy_params}
- {src: default.j2, dest: /etc/nginx/sites-available/default} - {src: default.j2, dest: /etc/nginx/sites-available/default}
- name: create base dir - name: Create base dir
file: ansible.builtin.file:
path: /srv/http path: /srv/http
owner: root owner: root
group: www-data group: www-data
mode: 'u+rwx,g+rs,o-rwx' mode: 'u+rwx,g+rs,o-rwx'
state: directory state: directory
- name: create letsencrypt dir - name: Create letsencrypt dir
file: ansible.builtin.file:
path: /srv/http/common/letsencrypt path: /srv/http/common/letsencrypt
owner: root owner: root
group: www-data group: www-data
mode: 'u+rwx,g+rs,o-rwx' mode: 'u+rwx,g+rs,o-rwx'
state: directory state: directory
- include_tasks: vhosts.yml - name: Include vhosts
ansible.builtin.include_tasks: vhosts.yml

View File

@@ -1,20 +1,21 @@
--- ---
- name: symlink vhosts - name: Symlink vhosts
file: ansible.builtin.file:
src: "/etc/nginx/sites-available/{{ item }}.conf" src: "/etc/nginx/sites-available/{{ item }}.conf"
dest: "/etc/nginx/sites-enabled/{{ item }}.conf" dest: "/etc/nginx/sites-enabled/{{ item }}.conf"
force: true force: true
follow: false follow: false
state: link state: link
notify: notify:
- restart nginx - Restart nginx
loop: "{{ web_hostname }}" loop: "{{ web_hostname }}"
- name: install vhosts - name: Install vhosts
template: ansible.builtin.template:
src: "vhosts/{{ item }}.conf.j2" src: "vhosts/{{ item }}.conf.j2"
dest: "/etc/nginx/sites-available/{{ item }}.conf" dest: "/etc/nginx/sites-available/{{ item }}.conf"
mode: 0644
notify: notify:
- restart nginx - Restart nginx
loop: "{{ web_hostname }}" loop: "{{ web_hostname }}"

View File

@@ -1,6 +1,6 @@
--- ---
- name: restart nut-client - name: Restart nut-client
service: ansible.builtin.service:
name: nut-client name: nut-client
state: restarted state: restarted

View File

@@ -1,21 +1,21 @@
--- ---
- name: install nut client - name: Rnstall nut client
package: ansible.builtin.package:
name: nut-client name: nut-client
state: present state: present
- name: upsmon.conf file - name: Upsmon.conf file
template: ansible.builtin.template:
src: upsmon.conf.j2 src: upsmon.conf.j2
dest: /etc/nut/upsmon.conf dest: /etc/nut/upsmon.conf
mode: '0640' mode: '0640'
notify: restart nut-client notify: Restart nut-client
- name: nut.conf file - name: Nut.conf file
copy: ansible.builtin.copy:
src: files/nut.conf src: files/nut.conf
dest: /etc/nut/nut.conf dest: /etc/nut/nut.conf
mode: '0640' mode: '0640'
when: inventory_hostname not in groups['nut_server'] when: inventory_hostname not in groups['nut_server']
notify: restart nut-client notify: Restart nut-client

View File

@@ -1,14 +1,16 @@
--- ---
- name: restart nut-server - name: Restart nut-server
service: ansible.builtin.service:
name: nut-server name: nut-server
state: restarted state: restarted
- name: udev - name: Udev
command: "udevadm control --reload-rules && udevadm trigger" ansible.builtin.command:
cmd: "udevadm control --reload-rules && udevadm trigger"
changed_when: false
- name: restart nut-driver - name: Restart nut-driver
service: ansible.builtin.service:
name: nut-driver name: nut-driver
state: restarted state: restarted

View File

@@ -1,42 +1,43 @@
--- ---
- name: install nut server - name: Install nut server
package: ansible.builtin.package:
name: nut-server name: nut-server
state: present state: present
- name: udev conf file for nut - name: Udev conf file for nut
copy: ansible.builtin.copy:
src: files/90-nut-ups.rules src: files/90-nut-ups.rules
dest: /etc/udev/rules.d/90-nut-ups.rules dest: /etc/udev/rules.d/90-nut-ups.rules
mode: 0644
notify: notify:
- udev - Udev
- restart nut-driver - Restart nut-driver
- name: nut.conf file - name: Nut.conf file
copy: ansible.builtin.copy:
src: files/nut.conf src: files/nut.conf
dest: /etc/nut/nut.conf dest: /etc/nut/nut.conf
mode: '0640' mode: '0640'
notify: restart nut-server notify: Restart nut-server
- name: ups.conf file - name: Ups.conf file
copy: ansible.builtin.copy:
src: files/ups.conf src: files/ups.conf
dest: /etc/nut/ups.conf dest: /etc/nut/ups.conf
mode: '0640' mode: '0640'
notify: restart nut-server notify: Restart nut-server
- name: upsd.conf file - name: Upsd.conf file
copy: ansible.builtin.copy:
src: files/upsd.conf src: files/upsd.conf
dest: /etc/nut/upsd.conf dest: /etc/nut/upsd.conf
mode: '0640' mode: '0640'
notify: restart nut-server notify: Restart nut-server
- name: upsd.users file - name: Upsd.users file
template: ansible.builtin.template:
src: upsd.users.j2 src: upsd.users.j2
dest: /etc/nut/upsd.users dest: /etc/nut/upsd.users
mode: '0640' mode: '0640'
notify: restart nut-server notify: Restart nut-server

View File

@@ -1,6 +1,6 @@
--- ---
- name: restart opendkim - name: Restart opendkim
service: ansible.builtin.service:
name: opendkim name: opendkim
state: restarted state: restarted

View File

@@ -1,33 +1,36 @@
--- ---
- name: install opendkim - name: Install opendkim
package: ansible.builtin.package:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
loop: loop:
- opendkim - opendkim
- opendkim-tools - opendkim-tools
- name: main configuration files - name: Main configuration files
template: ansible.builtin.template:
src: opendkim.conf src: opendkim.conf
dest: /etc/opendkim.conf dest: /etc/opendkim.conf
mode: 0644
notify: notify:
- restart opendkim - Restart opendkim
- name: dkim directory - name: Dkim directory
file: ansible.builtin.file:
path: /etc/dkim path: /etc/dkim
state: directory state: directory
mode: 0755
- name: secondary configuration files - name: Secondary configuration files
copy: ansible.builtin.copy:
src: "./files/dkim/{{ item }}" src: "./files/dkim/{{ item }}"
dest: "/etc/dkim/{{ item }}" dest: "/etc/dkim/{{ item }}"
mode: 0644
loop: loop:
- KeyTable - KeyTable
- PeerList - PeerList
- SigningTable - SigningTable
- TrustedHosts - TrustedHosts
notify: notify:
- restart opendkim - Restart opendkim

View File

@@ -1,6 +1,6 @@
--- ---
- name: restart opendmarc - name: Restart opendmarc
service: ansible.builtin.service:
name: opendmarc name: opendmarc
state: restarted state: restarted

View File

@@ -1,27 +1,30 @@
--- ---
- name: install opendmarc - name: Install opendmarc
package: ansible.builtin.package:
name: opendmarc name: opendmarc
state: present state: present
- name: opendmarc config file - name: Opendmarc config file
copy: ansible.builtin.copy:
src: ./files/opendmarc.conf src: ./files/opendmarc.conf
dest: /etc/opendmarc.conf dest: /etc/opendmarc.conf
mode: 0644
notify: notify:
- restart opendmarc - restart opendmarc
- name: dmarc directory - name: Dmarc directory
file: ansible.builtin.file:
path: /etc/dmarc path: /etc/dmarc
state: directory state: directory
mode: 0755
- name: secondary configuration files - name: Secondary configuration files
copy: ansible.builtin.copy:
src: "./files/dmarc/{{ item }}" src: "./files/dmarc/{{ item }}"
dest: "/etc/dmarc/{{ item }}" dest: "/etc/dmarc/{{ item }}"
mode: 0644
loop: loop:
- IgnoreHosts - IgnoreHosts
notify: notify:
- restart opendmarc - Restart opendmarc