Ansible-lint and yamllint again
Lot of truthy variables, indentation and trailing spaces
This commit is contained in:
parent
af7b3b36fe
commit
e29e0e9e62
|
@ -3,10 +3,10 @@
|
||||||
|
|
||||||
---
|
---
|
||||||
- hosts: all
|
- hosts: all
|
||||||
become: yes
|
become: true
|
||||||
become_method: su
|
become_method: su
|
||||||
user: root
|
user: root
|
||||||
gather_facts: no
|
gather_facts: false
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
|
|
||||||
|
|
|
@ -8,23 +8,23 @@ general_technical_realm: "example.com"
|
||||||
evomaintenance_realm: "example.com"
|
evomaintenance_realm: "example.com"
|
||||||
evomaintenance_alert_email: "evomaintenance-{{ inventory_hostname }}@{{ evomaintenance_realm }}"
|
evomaintenance_alert_email: "evomaintenance-{{ inventory_hostname }}@{{ evomaintenance_realm }}"
|
||||||
evomaintenance_hostname: "{{ inventory_hostname }}.{{ general_technical_realm }}"
|
evomaintenance_hostname: "{{ inventory_hostname }}.{{ general_technical_realm }}"
|
||||||
evomaintenance_pg_host: Null
|
evomaintenance_pg_host: null
|
||||||
evomaintenance_pg_passwd: Null
|
evomaintenance_pg_passwd: null
|
||||||
evomaintenance_pg_db: Null
|
evomaintenance_pg_db: null
|
||||||
evomaintenance_pg_table: Null
|
evomaintenance_pg_table: null
|
||||||
evomaintenance_from_domain: "{{ evomaintenance_realm }}"
|
evomaintenance_from_domain: "{{ evomaintenance_realm }}"
|
||||||
evomaintenance_from: "evomaintenance@{{ evomaintenance_from_domain }}"
|
evomaintenance_from: "evomaintenance@{{ evomaintenance_from_domain }}"
|
||||||
evomaintenance_full_from: "Evomaintenance <{{ evomaintenance_from }}>"
|
evomaintenance_full_from: "Evomaintenance <{{ evomaintenance_from }}>"
|
||||||
evomaintenance_urgency_from: mama.doe@example.com
|
evomaintenance_urgency_from: mama.doe@example.com
|
||||||
evomaintenance_urgency_tel: "06.00.00.00.00"
|
evomaintenance_urgency_tel: "06.00.00.00.00"
|
||||||
evomaintenance_install_vendor: False
|
evomaintenance_install_vendor: false
|
||||||
evomaintenance_force_config: True
|
evomaintenance_force_config: true
|
||||||
evomaintenance_api_endpoint: Null
|
evomaintenance_api_endpoint: null
|
||||||
evomaintenance_api_key: Null
|
evomaintenance_api_key: null
|
||||||
evomaintenance_hook_api: True
|
evomaintenance_hook_api: true
|
||||||
evomaintenance_hook_db: False
|
evomaintenance_hook_db: false
|
||||||
evomaintenance_hook_commit: True
|
evomaintenance_hook_commit: true
|
||||||
evomaintenance_hook_mail: True
|
evomaintenance_hook_mail: true
|
||||||
evomaintenance_default_hosts: []
|
evomaintenance_default_hosts: []
|
||||||
evomaintenance_additional_hosts: []
|
evomaintenance_additional_hosts: []
|
||||||
evomaintenance_hosts: "{{ evomaintenance_default_hosts | union(evomaintenance_additional_hosts) | unique }}"
|
evomaintenance_hosts: "{{ evomaintenance_default_hosts | union(evomaintenance_additional_hosts) | unique }}"
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
owner: root
|
owner: root
|
||||||
group: wheel
|
group: wheel
|
||||||
mode: "0640"
|
mode: "0640"
|
||||||
backup: no
|
backup: false
|
||||||
tags:
|
tags:
|
||||||
- doas
|
- doas
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
dest: /etc/skel/.profile
|
dest: /etc/skel/.profile
|
||||||
insertafter: EOF
|
insertafter: EOF
|
||||||
line: 'trap "doas /usr/share/scripts/evomaintenance.sh" 0'
|
line: 'trap "doas /usr/share/scripts/evomaintenance.sh" 0'
|
||||||
create: yes
|
create: true
|
||||||
tags:
|
tags:
|
||||||
- admin
|
- admin
|
||||||
- dotfiles
|
- dotfiles
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
owner: root
|
owner: root
|
||||||
group: wheel
|
group: wheel
|
||||||
mode: "0755"
|
mode: "0755"
|
||||||
force: no
|
force: false
|
||||||
tags:
|
tags:
|
||||||
- evobackup
|
- evobackup
|
||||||
|
|
||||||
|
@ -16,6 +16,6 @@
|
||||||
line: '#sh /usr/share/scripts/zzz_evobackup'
|
line: '#sh /usr/share/scripts/zzz_evobackup'
|
||||||
owner: root
|
owner: root
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
create: yes
|
create: true
|
||||||
tags:
|
tags:
|
||||||
- evobackup
|
- evobackup
|
||||||
|
|
|
@ -25,6 +25,6 @@
|
||||||
owner: root
|
owner: root
|
||||||
group: wheel
|
group: wheel
|
||||||
mode: "0600"
|
mode: "0600"
|
||||||
backup: no
|
backup: false
|
||||||
tags:
|
tags:
|
||||||
- evomaintenance
|
- evomaintenance
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
lineinfile:
|
lineinfile:
|
||||||
path: /etc/rc.local
|
path: /etc/rc.local
|
||||||
line: 'date | mail -s "boot/reboot of $(hostname -s)" {{ general_alert_email }}'
|
line: 'date | mail -s "boot/reboot of $(hostname -s)" {{ general_alert_email }}'
|
||||||
create: yes
|
create: true
|
||||||
tags:
|
tags:
|
||||||
- misc
|
- misc
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
dest: /etc/mail/aliases
|
dest: /etc/mail/aliases
|
||||||
regexp: "# root:"
|
regexp: "# root:"
|
||||||
replace: "root: {{ general_alert_email }}"
|
replace: "root: {{ general_alert_email }}"
|
||||||
backup: no
|
backup: false
|
||||||
notify:
|
notify:
|
||||||
- newaliases
|
- newaliases
|
||||||
tags:
|
tags:
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
- name: Disable sndiod
|
- name: Disable sndiod
|
||||||
service:
|
service:
|
||||||
name: sndiod
|
name: sndiod
|
||||||
enabled: no
|
enabled: false
|
||||||
state: stopped
|
state: stopped
|
||||||
tags:
|
tags:
|
||||||
- pkg
|
- pkg
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
insertafter: '# and set environment variables.'
|
insertafter: '# and set environment variables.'
|
||||||
line: '%wheel ALL=(ALL) SETENV: ALL'
|
line: '%wheel ALL=(ALL) SETENV: ALL'
|
||||||
validate: 'visudo -cf %s'
|
validate: 'visudo -cf %s'
|
||||||
backup: no
|
backup: false
|
||||||
tags:
|
tags:
|
||||||
- sudo
|
- sudo
|
||||||
|
|
||||||
|
@ -19,8 +19,6 @@
|
||||||
Cmnd_Alias MAINT = /usr/share/scripts/evomaintenance.sh
|
Cmnd_Alias MAINT = /usr/share/scripts/evomaintenance.sh
|
||||||
%wheel ALL=NOPASSWD: MAINT
|
%wheel ALL=NOPASSWD: MAINT
|
||||||
validate: 'visudo -cf %s'
|
validate: 'visudo -cf %s'
|
||||||
backup: no
|
backup: false
|
||||||
tags:
|
tags:
|
||||||
- sudo
|
- sudo
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
---
|
---
|
||||||
commit_message: Ansible run
|
commit_message: Ansible run
|
||||||
|
|
||||||
etc_git_monitor_status: True
|
etc_git_monitor_status: true
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
command: git status --porcelain
|
command: git status --porcelain
|
||||||
args:
|
args:
|
||||||
chdir: /etc
|
chdir: /etc
|
||||||
changed_when: False
|
changed_when: false
|
||||||
register: git_status
|
register: git_status
|
||||||
when: not ansible_check_mode
|
when: not ansible_check_mode
|
||||||
ignore_errors: yes
|
ignore_errors: true
|
||||||
tags:
|
tags:
|
||||||
- etc-git
|
- etc-git
|
||||||
- commit-etc
|
- commit-etc
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
repo: /etc
|
repo: /etc
|
||||||
scope: local
|
scope: local
|
||||||
register: git_config_user_email
|
register: git_config_user_email
|
||||||
ignore_errors: yes
|
ignore_errors: true
|
||||||
tags:
|
tags:
|
||||||
- etc-git
|
- etc-git
|
||||||
- commit-etc
|
- commit-etc
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
chdir: /etc
|
chdir: /etc
|
||||||
register: etc_commit_end_run
|
register: etc_commit_end_run
|
||||||
when: not ansible_check_mode and git_status.stdout != ""
|
when: not ansible_check_mode and git_status.stdout != ""
|
||||||
ignore_errors: yes
|
ignore_errors: true
|
||||||
tags:
|
tags:
|
||||||
- etc-git
|
- etc-git
|
||||||
- commit-etc
|
- commit-etc
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
args:
|
args:
|
||||||
chdir: /etc
|
chdir: /etc
|
||||||
creates: /etc/.git/
|
creates: /etc/.git/
|
||||||
warn: no
|
warn: false
|
||||||
register: git_init
|
register: git_init
|
||||||
tags:
|
tags:
|
||||||
- etc-git
|
- etc-git
|
||||||
|
@ -48,11 +48,11 @@
|
||||||
command: "git log"
|
command: "git log"
|
||||||
args:
|
args:
|
||||||
chdir: /etc
|
chdir: /etc
|
||||||
warn: no
|
warn: false
|
||||||
changed_when: False
|
changed_when: false
|
||||||
failed_when: False
|
failed_when: false
|
||||||
register: git_log
|
register: git_log
|
||||||
check_mode: no
|
check_mode: false
|
||||||
tags:
|
tags:
|
||||||
- etc-git
|
- etc-git
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@
|
||||||
shell: "git add -A . && git commit -m \"Initial commit via Ansible\""
|
shell: "git add -A . && git commit -m \"Initial commit via Ansible\""
|
||||||
args:
|
args:
|
||||||
chdir: /etc
|
chdir: /etc
|
||||||
warn: no
|
warn: false
|
||||||
register: git_commit
|
register: git_commit
|
||||||
when: git_log.rc != 0 or (git_init is defined and git_init.changed)
|
when: git_log.rc != 0 or (git_init is defined and git_init.changed)
|
||||||
tags:
|
tags:
|
||||||
|
@ -72,7 +72,7 @@
|
||||||
line: '/usr/local/bin/git --git-dir /etc/.git gc --quiet'
|
line: '/usr/local/bin/git --git-dir /etc/.git gc --quiet'
|
||||||
owner: root
|
owner: root
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
create: yes
|
create: true
|
||||||
tags:
|
tags:
|
||||||
- etc-git
|
- etc-git
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
line: "{{ item }}"
|
line: "{{ item }}"
|
||||||
owner: root
|
owner: root
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
create: yes
|
create: true
|
||||||
when: etc_git_monitor_status
|
when: etc_git_monitor_status
|
||||||
tags:
|
tags:
|
||||||
- etc-git
|
- etc-git
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
- name: run evocheck
|
- name: run evocheck
|
||||||
command: "{{ evocheck_bin_dir }}/evocheck.sh"
|
command: "{{ evocheck_bin_dir }}/evocheck.sh"
|
||||||
register: evocheck_run
|
register: evocheck_run
|
||||||
changed_when: False
|
changed_when: false
|
||||||
failed_when: False
|
failed_when: false
|
||||||
check_mode: no
|
check_mode: false
|
||||||
tags:
|
tags:
|
||||||
- evocheck-exec
|
- evocheck-exec
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
dest: "{{ evocheck_bin_dir }}/evocheck.sh"
|
dest: "{{ evocheck_bin_dir }}/evocheck.sh"
|
||||||
mode: "0700"
|
mode: "0700"
|
||||||
owner: root
|
owner: root
|
||||||
force: yes
|
force: true
|
||||||
tags:
|
tags:
|
||||||
- evocheck
|
- evocheck
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
copy:
|
copy:
|
||||||
src: evocheck.cf
|
src: evocheck.cf
|
||||||
dest: /etc/evocheck.cf
|
dest: /etc/evocheck.cf
|
||||||
force: no
|
force: false
|
||||||
tags:
|
tags:
|
||||||
- evocheck
|
- evocheck
|
||||||
|
|
||||||
|
@ -33,6 +33,6 @@
|
||||||
line: 'sh /usr/share/scripts/evocheck.sh --verbose --cron'
|
line: 'sh /usr/share/scripts/evocheck.sh --verbose --cron'
|
||||||
owner: root
|
owner: root
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
create: yes
|
create: true
|
||||||
tags:
|
tags:
|
||||||
- evocheck
|
- evocheck
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
name: net.inet.ip.forwarding
|
name: net.inet.ip.forwarding
|
||||||
value: 1
|
value: 1
|
||||||
state: present
|
state: present
|
||||||
reload: yes
|
reload: true
|
||||||
tags:
|
tags:
|
||||||
- net
|
- net
|
||||||
|
|
||||||
|
@ -13,6 +13,6 @@
|
||||||
name: net.inet6.ip6.forwarding
|
name: net.inet6.ip6.forwarding
|
||||||
value: 1
|
value: 1
|
||||||
state: present
|
state: present
|
||||||
reload: yes
|
reload: true
|
||||||
tags:
|
tags:
|
||||||
- net
|
- net
|
||||||
|
|
|
@ -54,5 +54,5 @@
|
||||||
- name: Starting and enabling nrpe
|
- name: Starting and enabling nrpe
|
||||||
service:
|
service:
|
||||||
name: nrpe
|
name: nrpe
|
||||||
enabled: yes
|
enabled: true
|
||||||
state: started
|
state: started
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
- name: Enabling OpenVPN
|
- name: Enabling OpenVPN
|
||||||
service:
|
service:
|
||||||
name: openvpn
|
name: openvpn
|
||||||
enabled: yes
|
enabled: true
|
||||||
tags:
|
tags:
|
||||||
- openvpn
|
- openvpn
|
||||||
|
|
||||||
|
@ -39,9 +39,8 @@
|
||||||
- name: Create shellpki user
|
- name: Create shellpki user
|
||||||
user:
|
user:
|
||||||
name: "_shellpki"
|
name: "_shellpki"
|
||||||
system: yes
|
system: true
|
||||||
state: present
|
state: present
|
||||||
system: yes
|
|
||||||
home: "/etc/shellpki/"
|
home: "/etc/shellpki/"
|
||||||
shell: "/sbin/nologin"
|
shell: "/sbin/nologin"
|
||||||
tags:
|
tags:
|
||||||
|
@ -54,7 +53,7 @@
|
||||||
owner: root
|
owner: root
|
||||||
group: wheel
|
group: wheel
|
||||||
mode: "{{ item.mode }}"
|
mode: "{{ item.mode }}"
|
||||||
force: yes
|
force: true
|
||||||
with_items:
|
with_items:
|
||||||
- {src: 'files/shellpki/openssl.cnf', dest: '/etc/shellpki/openssl.cnf', mode: '0640'}
|
- {src: 'files/shellpki/openssl.cnf', dest: '/etc/shellpki/openssl.cnf', mode: '0640'}
|
||||||
- {src: 'files/shellpki/shellpki', dest: '/usr/local/sbin/shellpki', mode: '0755'}
|
- {src: 'files/shellpki/shellpki', dest: '/usr/local/sbin/shellpki', mode: '0755'}
|
||||||
|
@ -103,7 +102,7 @@
|
||||||
owner: root
|
owner: root
|
||||||
group: wheel
|
group: wheel
|
||||||
mode: "{{ item.mode }}"
|
mode: "{{ item.mode }}"
|
||||||
force: yes
|
force: true
|
||||||
with_items:
|
with_items:
|
||||||
- {src: 'files/check_openvpn.pl', dest: '/usr/local/libexec/nagios/plugins/check_openvpn.pl', mode: '0755'}
|
- {src: 'files/check_openvpn.pl', dest: '/usr/local/libexec/nagios/plugins/check_openvpn.pl', mode: '0755'}
|
||||||
tags:
|
tags:
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
src: pf.conf.j2
|
src: pf.conf.j2
|
||||||
dest: /etc/pf.conf
|
dest: /etc/pf.conf
|
||||||
mode: "0600"
|
mode: "0600"
|
||||||
backup: yes
|
backup: true
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
command: git status --porcelain
|
command: git status --porcelain
|
||||||
args:
|
args:
|
||||||
chdir: /etc
|
chdir: /etc
|
||||||
changed_when: False
|
changed_when: false
|
||||||
register: git_status
|
register: git_status
|
||||||
when: not ansible_check_mode
|
when: not ansible_check_mode
|
||||||
ignore_errors: yes
|
ignore_errors: true
|
||||||
tags:
|
tags:
|
||||||
- commit-etc
|
- commit-etc
|
||||||
|
|
||||||
|
@ -16,6 +16,6 @@
|
||||||
chdir: /etc
|
chdir: /etc
|
||||||
register: etc_commit_end_evolinux
|
register: etc_commit_end_evolinux
|
||||||
when: not ansible_check_mode and git_status.stdout != ""
|
when: not ansible_check_mode and git_status.stdout != ""
|
||||||
ignore_errors: yes
|
ignore_errors: true
|
||||||
tags:
|
tags:
|
||||||
- commit-etc
|
- commit-etc
|
||||||
|
|
Loading…
Reference in a new issue