evolix
/
ansible-roles
22
2
Fork 2
Code Issues 61 Pull Requests 18 Releases 32 Wiki Activity

Revert "Add “when: not ansible_check_mode” to allow more --check"
gitea/ansible-roles/pipeline/head This commit looks good Details 

This reverts commit fafff25c20.
This reverts commit e64471c5a8084f95a8e6f955d3fa918c55b8e846.
This commit is contained in:
Jérémy Lecour 2022-12-14 07:38:04 +01:00 committed by Jérémy Lecour
parent 91b40ce72f
commit 1728eaee68
56 changed files with 46 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache/handlers/main.yml
View File

@ -3,16 +3,13 @@
service: service:
name: apache2 name: apache2
state: restarted state: restarted
when: not ansible_check_mode
- name: reload apache - name: reload apache
service: service:
name: apache2 name: apache2
state: reloaded state: reloaded
when: not ansible_check_mode
- name: restart munin-node - name: restart munin-node
service: service:
name: munin-node name: munin-node
state: restarted state: restarted
when: not ansible_check_mode

3
apache/tasks/auth.yml
View File

@ -22,7 +22,6 @@
state: present state: present
tags: tags:
- apache - apache
when: not ansible_check_mode
- name: Copy private_htpasswd - name: Copy private_htpasswd
copy: copy:
@ -45,7 +44,6 @@
notify: reload apache notify: reload apache
tags: tags:
- apache - apache
when: not ansible_check_mode
- name: remove user:pwd from private htpasswd - name: remove user:pwd from private htpasswd
lineinfile: lineinfile:
@ -56,4 +54,3 @@
notify: reload apache notify: reload apache
tags: tags:
- apache - apache
when: not ansible_check_mode

1
apache/tasks/ip_whitelist.yml
View File

@ -10,7 +10,6 @@
tags: tags:
- apache - apache
- ips - ips
when: not ansible_check_mode
- name: remove IP addresses from private IP whitelist - name: remove IP addresses from private IP whitelist
lineinfile: lineinfile:

1
apache/tasks/log2mail.yml
View File

@ -6,7 +6,6 @@
state: present state: present
tags: tags:
- apache - apache
when: not ansible_check_mode
- name: Add log2mail config for Apache segfaults - name: Add log2mail config for Apache segfaults
template: template:

18
apache/tasks/main.yml
View File

@ -53,7 +53,6 @@
notify: reload apache notify: reload apache
tags: tags:
- apache - apache
when: not ansible_check_mode
- name: basic modules are enabled - name: basic modules are enabled
apache2_module: apache2_module:
@ -62,11 +61,10 @@
loop: loop:
- cgi - cgi
notify: reload apache notify: reload apache
when: when: apache_mpm == "prefork" or apache_mpm == "itk"
- apache_mpm == "prefork" or apache_mpm == "itk"
- not ansible_check_mode
tags: tags:
- apache - apache
when: not ansible_check_mode
- name: Copy Apache defaults config file - name: Copy Apache defaults config file
@ -133,11 +131,10 @@
state: link state: link
force: yes force: yes
notify: reload apache notify: reload apache
when: when: apache_evolinux_default_enabled | bool
- apache_evolinux_default_enabled | bool
- not ansible_check_mode
tags: tags:
- apache - apache
when: not ansible_check_mode
- include: server_status.yml - include: server_status.yml
tags: tags:
@ -160,11 +157,10 @@
## Set umask for writing by Apache user. ## Set umask for writing by Apache user.
## Set rights on files and directories written by Apache ## Set rights on files and directories written by Apache
umask 007 umask 007
when: when: envvar_grep_umask.rc != 0
- envvar_grep_umask.rc != 0
- not ansible_check_mode
tags: tags:
- apache - apache
when: not ansible_check_mode
- include_role: - include_role:
name: evolix/remount-usr name: evolix/remount-usr
@ -197,7 +193,6 @@
replace: "{{ apache_logrotate_frequency }}" replace: "{{ apache_logrotate_frequency }}"
tags: tags:
- apache - apache
when: not ansible_check_mode
- name: "logrotate: rotate {{ apache_logrotate_rotate }}" - name: "logrotate: rotate {{ apache_logrotate_rotate }}"
replace: replace:
@ -206,7 +201,6 @@
replace: '\1 {{ apache_logrotate_rotate }}' replace: '\1 {{ apache_logrotate_rotate }}'
tags: tags:
- apache - apache
when: not ansible_check_mode
- include: log2mail.yml - include: log2mail.yml
when: apache_log2mail_include when: apache_log2mail_include

3
apache/tasks/munin.yml
View File

@ -23,7 +23,6 @@
tags: tags:
- apache - apache
- munin - munin
when: not ansible_check_mode
- name: "Install fcgi packages for Munin graphs" - name: "Install fcgi packages for Munin graphs"
apt: apt:
@ -44,7 +43,6 @@
tags: tags:
- apache - apache
- munin - munin
when: not ansible_check_mode
- name: "Apache has access to /var/log/munin/" - name: "Apache has access to /var/log/munin/"
file: file:
@ -53,4 +51,3 @@
tags: tags:
- apache - apache
- munin - munin
when: not ansible_check_mode

7
apache/tasks/server_status.yml
View File

@ -26,12 +26,10 @@
changed_when: False changed_when: False
check_mode: no check_mode: no
register: new_apache_serverstatus_suffix register: new_apache_serverstatus_suffix
when: not ansible_check_mode
- name: overwrite apache_serverstatus_suffix - name: overwrite apache_serverstatus_suffix
set_fact: set_fact:
apache_serverstatus_suffix: "{{ new_apache_serverstatus_suffix.stdout }}" apache_serverstatus_suffix: "{{ new_apache_serverstatus_suffix.stdout }}"
when: not ansible_check_mode
- debug: - debug:
var: apache_serverstatus_suffix var: apache_serverstatus_suffix
@ -42,14 +40,12 @@
dest: /var/www/index.html dest: /var/www/index.html
regexp: '__SERVERSTATUS_SUFFIX__' regexp: '__SERVERSTATUS_SUFFIX__'
replace: "{{ apache_serverstatus_suffix }}" replace: "{{ apache_serverstatus_suffix }}"
when: not ansible_check_mode
- name: add server-status suffix in default site index if missing - name: add server-status suffix in default site index if missing
replace: replace:
dest: /var/www/index.html dest: /var/www/index.html
regexp: '"/server-status-?"' regexp: '"/server-status-?"'
replace: '"/server-status-{{ apache_serverstatus_suffix }}"' replace: '"/server-status-{{ apache_serverstatus_suffix }}"'
when: not ansible_check_mode
- name: add server-status suffix in default VHost - name: add server-status suffix in default VHost
replace: replace:
@ -57,14 +53,12 @@
regexp: '<Location /server-status-?>' regexp: '<Location /server-status-?>'
replace: '<Location /server-status-{{ apache_serverstatus_suffix }}>' replace: '<Location /server-status-{{ apache_serverstatus_suffix }}>'
notify: reload apache notify: reload apache
when: not ansible_check_mode
- name: Munin configuration has a section for apache - name: Munin configuration has a section for apache
lineinfile: lineinfile:
dest: /etc/munin/plugin-conf.d/munin-node dest: /etc/munin/plugin-conf.d/munin-node
line: "[apache_*]" line: "[apache_*]"
create: no create: no
when: not ansible_check_mode
- name: apache-status URL is configured for Munin - name: apache-status URL is configured for Munin
lineinfile: lineinfile:
@ -74,4 +68,3 @@
insertafter: "[apache_*]" insertafter: "[apache_*]"
create: no create: no
notify: restart munin-node notify: restart munin-node
when: not ansible_check_mode

5
etc-git/tasks/main.yml
View File

@ -8,7 +8,6 @@
- etc-git - etc-git
when: when:
- ansible_distribution == "Debian" - ansible_distribution == "Debian"
- not ansible_check_mode
- name: Install and configure utilities - name: Install and configure utilities
include: utils.yml include: utils.yml
@ -19,6 +18,4 @@
include: repositories.yml include: repositories.yml
tags: tags:
- etc-git - etc-git
when: when: etc_git_config_repositories | bool
- etc_git_config_repositories | bool
- not ansible_check_mode

2
etc-git/tasks/repositories.yml
View File

@ -34,4 +34,4 @@
- _usr_share_scripts.stat.isdir - _usr_share_scripts.stat.isdir
- ansible_distribution_major_version is version('10', '>=') - ansible_distribution_major_version is version('10', '>=')
tags: tags:
- etc-git - etc-git

4
etc-git/tasks/repository.yml
View File

@ -22,7 +22,6 @@
value: "root@{{ ansible_fqdn | default('localhost') }}" value: "root@{{ ansible_fqdn | default('localhost') }}"
tags: tags:
- etc-git - etc-git
when: not ansible_check_mode
- name: "{{ repository_path }}/.git is restricted to root" - name: "{{ repository_path }}/.git is restricted to root"
file: file:
@ -50,7 +49,6 @@
loop: "{{ gitignore_items | default([]) }}" loop: "{{ gitignore_items | default([]) }}"
tags: tags:
- etc-git - etc-git
when: not ansible_check_mode
- name: "does {{ repository_path }}/ have any commit?" - name: "does {{ repository_path }}/ have any commit?"
command: "git log" command: "git log"
@ -72,4 +70,4 @@
register: git_commit register: git_commit
when: git_log.rc != 0 or (git_init is defined and git_init is changed) when: git_log.rc != 0 or (git_init is defined and git_init is changed)
tags: tags:
- etc-git - etc-git

5
evoacme/handlers/main.yml
View File

@ -1,17 +1,14 @@
- name: newaliases - name: newaliases
command: newaliases command: newaliases
when: not ansible_check_mode
- name: Test Apache conf - name: Test Apache conf
command: apache2ctl -t command: apache2ctl -t
notify: "Reload Apache conf" notify: "Reload Apache conf"
when: not ansible_check_mode
- name: reload apache2 - name: reload apache2
service: service:
name: apache2 name: apache2
state: reloaded state: reloaded
when: not ansible_check_mode
- name: apt update - name: apt update
apt: apt:
@ -21,10 +18,8 @@
service: service:
name: squid3 name: squid3
state: reloaded state: reloaded
when: not ansible_check_mode
- name: reload squid - name: reload squid
service: service:
name: squid name: squid
state: reloaded state: reloaded
when: not ansible_check_mode

4
evocheck/tasks/exec.yml
View File

@ -10,8 +10,6 @@
- debug: - debug:
var: evocheck_run.stdout_lines var: evocheck_run.stdout_lines
when: when: evocheck_run.stdout | length > 0
- not ansible_check_mode
- evocheck_run.stdout | length > 0
tags: tags:
- evocheck-exec - evocheck-exec

1
evolinux-base/tasks/default_www.yml
View File

@ -38,7 +38,6 @@
owner: root owner: root
group: ssl-cert group: ssl-cert
mode: "0640" mode: "0640"
when: not ansible_check_mode
- name: Create certificate for default site - name: Create certificate for default site
command: openssl x509 -req -days 3650 -sha256 -in /etc/ssl/{{ ansible_fqdn }}.csr -signkey /etc/ssl/private/{{ ansible_fqdn }}.key -out /etc/ssl/certs/{{ ansible_fqdn }}.crt command: openssl x509 -req -days 3650 -sha256 -in /etc/ssl/{{ ansible_fqdn }}.csr -signkey /etc/ssl/private/{{ ansible_fqdn }}.key -out /etc/ssl/certs/{{ ansible_fqdn }}.crt

8
evolinux-base/tasks/hardware.yml
View File

@ -43,9 +43,7 @@
state: present state: present
tags: tags:
- packages - packages
when: when: ansible_virtualization_role == "host"
- ansible_virtualization_role == "host"
- not ansible_check_mode
## RAID ## RAID
# Dell and others: MegaRAID SAS # Dell and others: MegaRAID SAS
@ -110,7 +108,6 @@
name: ssacli name: ssacli
tags: tags:
- packages - packages
when: not ansible_check_mode
when: when:
- "'Hewlett-Packard Company Smart Array' in raidmodel.stdout" - "'Hewlett-Packard Company Smart Array' in raidmodel.stdout"
- "'Adaptec Smart Storage PQI' in raidmodel.stdout" - "'Adaptec Smart Storage PQI' in raidmodel.stdout"
@ -137,7 +134,6 @@
state: present state: present
tags: tags:
- packages - packages
when: not ansible_check_mode
- name: cciss-vol-statusd init script is present (HP gen <10) - name: cciss-vol-statusd init script is present (HP gen <10)
template: template:
@ -250,7 +246,6 @@
allow_unauthenticated: yes allow_unauthenticated: yes
tags: tags:
- packages - packages
when: not ansible_check_mode
- name: Configure packages for DELL/LSI hardware - name: Configure packages for DELL/LSI hardware
template: template:
@ -268,7 +263,6 @@
tags: tags:
- packages - packages
- config - config
when: not ansible_check_mode
when: when:
- "'MegaRAID' in raidmodel.stdout" - "'MegaRAID' in raidmodel.stdout"
- evolinux_packages_hardware_raid | bool - evolinux_packages_hardware_raid | bool

2
evolinux-base/tasks/log2mail.yml
View File

@ -16,7 +16,6 @@
daemon-reload: yes daemon-reload: yes
state: started state: started
enabled: yes enabled: yes
when: not ansible_check_mode
- name: log2mail config is present - name: log2mail config is present
blockinfile: blockinfile:
@ -33,5 +32,4 @@
notify: restart log2mail notify: restart log2mail
tags: tags:
- log2mail - log2mail
when: not ansible_check_mode

4
evolinux-base/tasks/packages.yml
View File

@ -89,9 +89,7 @@
apt: apt:
name: serveur-base name: serveur-base
allow_unauthenticated: yes allow_unauthenticated: yes
when: when: evolinux_packages_serveur_base | bool
- evolinux_packages_serveur_base | bool
- not ansible_check_mode
- name: Install/Update packages for Stretch and later - name: Install/Update packages for Stretch and later
apt: apt:

14
evolinux-base/tasks/postfix.yml
View File

@ -20,7 +20,6 @@
notify: reload postfix notify: reload postfix
tags: tags:
- postfix - postfix
when: not ansible_check_mode
- name: configure postfix mynetworks - name: configure postfix mynetworks
lineinfile: lineinfile:
@ -31,7 +30,6 @@
notify: reload postfix notify: reload postfix
tags: tags:
- postfix - postfix
when: not ansible_check_mode
- name: fetch users list - name: fetch users list
shell: "set -o pipefail && getent passwd | cut -d':' -f 1 | grep -v root" shell: "set -o pipefail && getent passwd | cut -d':' -f 1 | grep -v root"
@ -50,9 +48,7 @@
line: "{{ item }}: root" line: "{{ item }}: root"
loop: "{{ non_root_users_list.stdout_lines }}" loop: "{{ non_root_users_list.stdout_lines }}"
notify: newaliases notify: newaliases
when: when: evolinux_postfix_users_alias_root | bool
- evolinux_postfix_users_alias_root | bool
- not ansible_check_mode
tags: tags:
- postfix - postfix
@ -69,9 +65,7 @@
- error - error
- bounce - bounce
notify: newaliases notify: newaliases
when: when: evolinux_postfix_mailer_alias_root | bool
- evolinux_postfix_mailer_alias_root | bool
- not ansible_check_mode
tags: tags:
- postfix - postfix
@ -81,9 +75,7 @@
regexp: "^root:" regexp: "^root:"
line: "root: {{ postfix_alias_email or general_alert_email | mandatory }}" line: "root: {{ postfix_alias_email or general_alert_email | mandatory }}"
notify: newaliases notify: newaliases
when: when: evolinux_postfix_root_alias | bool
- evolinux_postfix_root_alias | bool
- not ansible_check_mode
tags: tags:
- postfix - postfix

5
evolinux-users/tasks/user.yml
View File

@ -160,9 +160,7 @@
dest: '/home/{{ user.name }}/.profile' dest: '/home/{{ user.name }}/.profile'
insertafter: EOF insertafter: EOF
line: 'trap "sudo /usr/share/scripts/evomaintenance.sh" 0' line: 'trap "sudo /usr/share/scripts/evomaintenance.sh" 0'
when: when: grep_profile_evomaintenance.rc != 0
- grep_profile_evomaintenance.rc != 0
- not ansible_check_mode
# SSH keys # SSH keys
@ -194,6 +192,5 @@
when: when:
- user.ssh_keys is defined - user.ssh_keys is defined
- user.ssh_keys | length > 0 - user.ssh_keys | length > 0
- not ansible_check_mode
- meta: flush_handlers - meta: flush_handlers

3
haproxy/handlers/main.yml
View File

@ -3,16 +3,13 @@
service: service:
name: haproxy name: haproxy
state: reloaded state: reloaded
when: not ansible_check_mode
- name: restart haproxy - name: restart haproxy
service: service:
name: haproxy name: haproxy
state: restarted state: restarted
when: not ansible_check_mode
- name: restart munin-node - name: restart munin-node
service: service:
name: munin-node name: munin-node
state: restarted state: restarted
when: not ansible_check_mode

2
haproxy/tasks/main.yml
View File

@ -123,7 +123,6 @@
tags: tags:
- haproxy - haproxy
- logrotate - logrotate
when: not ansible_check_mode
- name: Rotate logs with nodelaycompress - name: Rotate logs with nodelaycompress
lineinfile: lineinfile:
@ -134,7 +133,6 @@
tags: tags:
- haproxy - haproxy
- logrotate - logrotate
when: not ansible_check_mode
- name: Set net.ipv4.ip_nonlocal_bind - name: Set net.ipv4.ip_nonlocal_bind
sysctl: sysctl:

1
lxc-php/tasks/php74.yml
View File

@ -10,7 +10,6 @@
dest: "/var/lib/lxc/{{ lxc_php_version }}/rootfs/etc/apt/sources.list" dest: "/var/lib/lxc/{{ lxc_php_version }}/rootfs/etc/apt/sources.list"
regexp: 'bullseye/updates' regexp: 'bullseye/updates'
replace: 'bullseye-security' replace: 'bullseye-security'
when: not ansible_check_mode
- name: "{{ lxc_php_version }} - Copy evolinux PHP configuration" - name: "{{ lxc_php_version }} - Copy evolinux PHP configuration"
template: template:

1
lxc-php/tasks/php80.yml
View File

@ -10,7 +10,6 @@
dest: "/var/lib/lxc/{{ lxc_php_version }}/rootfs/etc/apt/sources.list" dest: "/var/lib/lxc/{{ lxc_php_version }}/rootfs/etc/apt/sources.list"
regexp: 'bullseye/updates' regexp: 'bullseye/updates'
replace: 'bullseye-security' replace: 'bullseye-security'
when: not ansible_check_mode
- name: "{{ lxc_php_version }} - Add sury repo" - name: "{{ lxc_php_version }} - Add sury repo"
lineinfile: lineinfile:

1
lxc-php/tasks/php81.yml
View File

@ -10,7 +10,6 @@
dest: "/var/lib/lxc/{{ lxc_php_version }}/rootfs/etc/apt/sources.list" dest: "/var/lib/lxc/{{ lxc_php_version }}/rootfs/etc/apt/sources.list"
regexp: 'bullseye/updates' regexp: 'bullseye/updates'
replace: 'bullseye-security' replace: 'bullseye-security'
when: not ansible_check_mode
- name: "{{ lxc_php_version }} - Add sury repo" - name: "{{ lxc_php_version }} - Add sury repo"
lineinfile: lineinfile:

18
lxc/tasks/create-container.yml
View File

@ -4,7 +4,6 @@
changed_when: false changed_when: false
check_mode: no check_mode: no
register: container_exists register: container_exists
when: not ansible_check_mode
- name: "Create container {{ name }}" - name: "Create container {{ name }}"
lxc_container: lxc_container:
@ -13,26 +12,20 @@
template: debian template: debian
state: stopped state: stopped
template_options: "--arch amd64 --release {{ release }}" template_options: "--arch amd64 --release {{ release }}"
when: when: container_exists.stdout_lines | length == 0
- container_exists.stdout_lines | length == 0
- not ansible_check_mode
- name: "Disable network configuration inside container {{ name }}" - name: "Disable network configuration inside container {{ name }}"
replace: replace:
name: "/var/lib/lxc/{{ name }}/rootfs/etc/default/networking" name: "/var/lib/lxc/{{ name }}/rootfs/etc/default/networking"
regexp: "^#CONFIGURE_INTERFACES=yes" regexp: "^#CONFIGURE_INTERFACES=yes"
replace: CONFIGURE_INTERFACES=no replace: CONFIGURE_INTERFACES=no
when: when: lxc_network_type == "none"
- lxc_network_type == "none"
- not ansible_check_mode
- name: "Disable interface shut down on halt inside container {{ name }} (Jessie container)" - name: "Disable interface shut down on halt inside container {{ name }} (Jessie container)"
lineinfile: lineinfile:
name: "/var/lib/lxc/{{ name }}/rootfs/etc/default/halt" name: "/var/lib/lxc/{{ name }}/rootfs/etc/default/halt"
line: "NETDOWN=no" line: "NETDOWN=no"
when: when: lxc_network_type == "none" and release == "jessie"
- lxc_network_type == "none" and release == "jessie"
- not ansible_check_mode
- name: "Make the container {{ name }} poweroff on SIGPWR sent by lxc-stop (Jessie container)" - name: "Make the container {{ name }} poweroff on SIGPWR sent by lxc-stop (Jessie container)"
file: file:
@ -51,16 +44,13 @@
lineinfile: lineinfile:
name: "/var/lib/lxc/{{ name }}/rootfs/etc/hosts" name: "/var/lib/lxc/{{ name }}/rootfs/etc/hosts"
line: "127.0.0.1 {{ name }}" line: "127.0.0.1 {{ name }}"
when: not ansible_check_mode
- name: "Fix permission on /dev for container {{ name }}" - name: "Fix permission on /dev for container {{ name }}"
lineinfile: lineinfile:
name: "/var/lib/lxc/{{ name }}/rootfs/etc/rc.local" name: "/var/lib/lxc/{{ name }}/rootfs/etc/rc.local"
line: "chmod 755 /dev" line: "chmod 755 /dev"
insertbefore: "^exit 0$" insertbefore: "^exit 0$"
when: when: release == 'jessie'
- release == 'jessie'
- not ansible_check_mode
- name: "Ensure that {{ name }} container is running" - name: "Ensure that {{ name }} container is running"
lxc_container: lxc_container:

2
lxc/tasks/main.yml
View File

@ -48,7 +48,6 @@
changed_when: false changed_when: false
check_mode: no check_mode: no
register: check_fs_options register: check_fs_options
when: not ansible_check_mode
- name: Check if options are correct - name: Check if options are correct
assert: assert:
@ -57,7 +56,6 @@
- "'noexec' not in check_fs_options.stdout" - "'noexec' not in check_fs_options.stdout"
- "'nosuid' not in check_fs_options.stdout" - "'nosuid' not in check_fs_options.stdout"
msg: "LXC directory is in a filesystem with incompatible options" msg: "LXC directory is in a filesystem with incompatible options"
when: not ansible_check_mode
- name: Create containers - name: Create containers
include: create-container.yml include: create-container.yml

22
minifirewall/tasks/config.yml
View File

@ -30,7 +30,6 @@
line: "# BEGIN ANSIBLE MANAGED BLOCK FOR IPS" line: "# BEGIN ANSIBLE MANAGED BLOCK FOR IPS"
insertbefore: '^# Main interface' insertbefore: '^# Main interface'
create: no create: no
when: not ansible_check_mode
- name: End marker for IP addresses - name: End marker for IP addresses
lineinfile: lineinfile:
@ -38,7 +37,6 @@
create: no create: no
line: "# END ANSIBLE MANAGED BLOCK FOR IPS" line: "# END ANSIBLE MANAGED BLOCK FOR IPS"
insertafter: '^PRIVILEGIEDIPS=' insertafter: '^PRIVILEGIEDIPS='
when: not ansible_check_mode
- name: Verify that at least 1 trusted IP is provided - name: Verify that at least 1 trusted IP is provided
assert: assert:
@ -86,7 +84,6 @@
PRIVILEGIEDIPS='{{ minifirewall_privilegied_ips | join(' ') }}' PRIVILEGIEDIPS='{{ minifirewall_privilegied_ips | join(' ') }}'
create: no create: no
register: minifirewall_config_ips register: minifirewall_config_ips
when: not ansible_check_mode
- name: Begin marker for ports - name: Begin marker for ports
lineinfile: lineinfile:
@ -94,7 +91,6 @@
line: "# BEGIN ANSIBLE MANAGED BLOCK FOR PORTS" line: "# BEGIN ANSIBLE MANAGED BLOCK FOR PORTS"
insertbefore: '^# Protected services' insertbefore: '^# Protected services'
create: no create: no
when: not ansible_check_mode
- name: End marker for ports - name: End marker for ports
lineinfile: lineinfile:
@ -102,7 +98,6 @@
line: "# END ANSIBLE MANAGED BLOCK FOR PORTS" line: "# END ANSIBLE MANAGED BLOCK FOR PORTS"
insertafter: '^SERVICESUDP3=' insertafter: '^SERVICESUDP3='
create: no create: no
when: not ansible_check_mode
- name: Configure ports - name: Configure ports
blockinfile: blockinfile:
@ -127,7 +122,6 @@
SERVICESUDP3='{{ minifirewall_private_ports_udp | join(' ') }}' SERVICESUDP3='{{ minifirewall_private_ports_udp | join(' ') }}'
create: no create: no
register: minifirewall_config_ports register: minifirewall_config_ports
when: not ansible_check_mode
- name: Configure DNSSERVEURS - name: Configure DNSSERVEURS
lineinfile: lineinfile:
@ -199,9 +193,7 @@
line: "PROXY='{{ minifirewall_proxy }}'" line: "PROXY='{{ minifirewall_proxy }}'"
regexp: "PROXY=('|\").*('|\")" regexp: "PROXY=('|\").*('|\")"
create: no create: no
when: when: minifirewall_proxy is not none
- minifirewall_proxy is not none
- not ansible_check_mode
- name: Configure PROXYPORT - name: Configure PROXYPORT
lineinfile: lineinfile:
@ -209,9 +201,7 @@
line: "PROXYPORT='{{ minifirewall_proxyport }}'" line: "PROXYPORT='{{ minifirewall_proxyport }}'"
regexp: "PROXYPORT=('|\").*('|\")" regexp: "PROXYPORT=('|\").*('|\")"
create: no create: no
when: when: minifirewall_proxyport is not none
- minifirewall_proxyport is not none
- not ansible_check_mode
# Warning: keep double quotes for the value, # Warning: keep double quotes for the value,
# since we often reference a shell variable that needs to be interpolated # since we often reference a shell variable that needs to be interpolated
@ -221,9 +211,7 @@
line: "PROXYBYPASS=\"{{ minifirewall_proxybypass | join(' ') }}\"" line: "PROXYBYPASS=\"{{ minifirewall_proxybypass | join(' ') }}\""
regexp: "PROXYBYPASS=('|\").*('|\")" regexp: "PROXYBYPASS=('|\").*('|\")"
create: no create: no
when: when: minifirewall_proxybypass is not none
- minifirewall_proxyport is not none
- not ansible_check_mode
- name: Configure BACKUPSERVERS - name: Configure BACKUPSERVERS
lineinfile: lineinfile:
@ -231,9 +219,7 @@
line: "BACKUPSERVERS='{{ minifirewall_backupservers | join(' ') }}'" line: "BACKUPSERVERS='{{ minifirewall_backupservers | join(' ') }}'"
regexp: "BACKUPSERVERS=('|\").*('|\")" regexp: "BACKUPSERVERS=('|\").*('|\")"
create: no create: no
when: when: minifirewall_backupservers is not none
- minifirewall_backupservers is not none
- not ansible_check_mode
- name: Configure SYSCTL_ICMP_ECHO_IGNORE_BROADCASTS - name: Configure SYSCTL_ICMP_ECHO_IGNORE_BROADCASTS
lineinfile: lineinfile:

4
munin/handlers/main.yml
View File

@ -4,14 +4,12 @@
service: service:
name: munin-node name: munin-node
state: restarted state: restarted
when: not ansible_check_mode
- name: restart munin_node - name: restart munin_node
service: service:
name: munin_node name: munin_node
state: restarted state: restarted
when: not ansible_check_mode
- name: systemd daemon-reload - name: systemd daemon-reload
systemd: systemd:
daemon_reload: yes daemon_reload: yes

7
munin/tasks/main.yml
View File

@ -32,9 +32,7 @@
removes: /var/lib/munin/localdomain removes: /var/lib/munin/localdomain
notify: restart munin-node notify: restart munin-node
when: when: not ansible_hostname == "localdomain"
- not ansible_hostname == "localdomain"
- not ansible_check_mode
tags: tags:
- munin - munin
@ -81,7 +79,6 @@
notify: restart munin-node notify: restart munin-node
tags: tags:
- munin - munin
when: not ansible_check_mode
- name: Enable sensors_ plugin on dedicated hardware - name: Enable sensors_ plugin on dedicated hardware
file: file:
@ -95,7 +92,6 @@
notify: restart munin-node notify: restart munin-node
tags: tags:
- munin - munin
when: not ansible_check_mode
- name: Enable ipmi_ plugin on dedicated hardware - name: Enable ipmi_ plugin on dedicated hardware
file: file:
@ -109,7 +105,6 @@
- temp - temp
- power - power
- volts - volts
when: not ansible_check_mode
- name: adjustments for grsec kernel - name: adjustments for grsec kernel
blockinfile: blockinfile:

1
mysql/tasks/datadir.yml
View File

@ -43,4 +43,3 @@
- mysql_custom_datadir | length > 0 - mysql_custom_datadir | length > 0
- mysql_custom_datadir != mysql_current_real_datadir_test.stdout - mysql_custom_datadir != mysql_current_real_datadir_test.stdout
- not mysql_custom_datadir_test.stat.exists - not mysql_custom_datadir_test.stat.exists
- not ansible_check_mode

1
mysql/tasks/logdir.yml
View File

@ -43,4 +43,3 @@
- mysql_custom_logdir | length > 0 - mysql_custom_logdir | length > 0
- mysql_custom_logdir != mysql_current_real_logdir_test.stdout - mysql_custom_logdir != mysql_current_real_logdir_test.stdout
- not mysql_custom_logdir_test.stat.exists - not mysql_custom_logdir_test.stat.exists
- not ansible_check_mode

1
mysql/tasks/packages_jessie.yml
View File

@ -42,7 +42,6 @@
tags: tags:
- mysql - mysql
- services - services
when: not ansible_check_mode
- name: apg package is installed - name: apg package is installed
apt: apt:

3
mysql/tasks/packages_stretch.yml
View File

@ -28,7 +28,6 @@
tags: tags:
- mysql - mysql
- services - services
when: not ansible_check_mode
- name: apg package is installed - name: apg package is installed
apt: apt:
@ -58,4 +57,4 @@
tags: tags:
- mysql - mysql
- packages - packages
when: ansible_python_version is version('3', '>=') when: ansible_python_version is version('3', '>=')

6
mysql/tasks/utils.yml
View File

@ -155,9 +155,7 @@
src: "{{ _mysql_scripts_dir }}/mysql-optimize.sh" src: "{{ _mysql_scripts_dir }}/mysql-optimize.sh"
dest: /etc/cron.{{ mysql_cron_optimize_frequency | mandatory }}/mysql-optimize.sh dest: /etc/cron.{{ mysql_cron_optimize_frequency | mandatory }}/mysql-optimize.sh
state: link state: link
when: when: mysql_cron_optimize | bool
- mysql_cron_optimize | bool
- not ansible_check_mode
tags: tags:
- mysql - mysql
@ -250,4 +248,4 @@
mode: "0755" mode: "0755"
force: no force: no
tags: tags:
- mysql - mysql

2
nagios-nrpe/handlers/main.yml
View File

@ -4,10 +4,8 @@
service: service:
name: nagios-nrpe-server name: nagios-nrpe-server
state: restarted state: restarted
when: not ansible_check_mode
- name: restart nrpe - name: restart nrpe
service: service:
name: nrpe name: nrpe
state: restarted state: restarted
when: not ansible_check_mode

1
ntpd/tasks/main.yml
View File

@ -21,4 +21,3 @@
notify: restart ntp notify: restart ntp
tags: tags:
- ntp - ntp
when: not ansible_check_mode

6
packweb-apache/tasks/apache.yml
View File

@ -14,9 +14,7 @@
block: | block: |
# Used for Evoadmin-web # Used for Evoadmin-web
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
when: when: envvar_grep_path.rc != 0
- envvar_grep_path.rc != 0
- not ansible_check_mode
- name: Additional packages are installed - name: Additional packages are installed
apt: apt:
@ -36,7 +34,6 @@
- negotiation - negotiation
- alias - alias
- log_forensic - log_forensic
when: not ansible_check_mode
- name: Copy Apache settings for modules - name: Copy Apache settings for modules
copy: copy:
@ -63,4 +60,3 @@
loop: loop:
- evolinux-evasive - evolinux-evasive
- evolinux-modsec - evolinux-modsec
when: not ansible_check_mode

4
packweb-apache/tasks/awstats.yml
View File

@ -22,7 +22,6 @@
AllowFullYearView=3 AllowFullYearView=3
ErrorMessages="An error occured. Contact your Administrator" ErrorMessages="An error occured. Contact your Administrator"
mode: "0644" mode: "0644"
when: not ansible_check_mode
- name: Create conf-available/awstats-icon.conf file - name: Create conf-available/awstats-icon.conf file
copy: copy:
@ -40,7 +39,6 @@
register: command_result register: command_result
changed_when: "'Enabling' in command_result.stderr" changed_when: "'Enabling' in command_result.stderr"
notify: reload apache notify: reload apache
when: not ansible_check_mode
- name: Create awstats cron - name: Create awstats cron
lineinfile: lineinfile:
@ -48,7 +46,6 @@
create: yes create: yes
regexp: '-config=awstats' regexp: '-config=awstats'
line: "10 */6 * * * root umask 033; [ -x /usr/lib/cgi-bin/awstats.pl -a -f /etc/awstats/awstats.conf -a -r /var/log/apache2/access.log ] && /usr/lib/cgi-bin/awstats.pl -config=awstats -update >/dev/null" line: "10 */6 * * * root umask 033; [ -x /usr/lib/cgi-bin/awstats.pl -a -f /etc/awstats/awstats.conf -a -r /var/log/apache2/access.log ] && /usr/lib/cgi-bin/awstats.pl -config=awstats -update >/dev/null"
when: not ansible_check_mode
- name: Comment default awstat cron's tasks - name: Comment default awstat cron's tasks
lineinfile: lineinfile:
@ -57,4 +54,3 @@
line: '#\1' line: '#\1'
backrefs: yes backrefs: yes
state: present state: present
when: not ansible_check_mode

3
packweb-apache/tasks/main.yml
View File

@ -26,7 +26,6 @@
dest: /var/www/index.html dest: /var/www/index.html
line: ' <li><a href="/info.php">Infos PHP</a></li>' line: ' <li><a href="/info.php">Infos PHP</a></li>'
regexp: "Infos PHP" regexp: "Infos PHP"
when: not ansible_check_mode
- name: install opcache.php - name: install opcache.php
copy: copy:
@ -39,7 +38,6 @@
dest: /var/www/index.html dest: /var/www/index.html
line: ' <li><a href="/opcache.php">Infos OpCache PHP</a></li>' line: ' <li><a href="/opcache.php">Infos OpCache PHP</a></li>'
regexp: "Infos OpCache PHP" regexp: "Infos OpCache PHP"
when: not ansible_check_mode
- name: Add elements to user account template - name: Add elements to user account template
file: file:
@ -66,7 +64,6 @@
loop: loop:
- access.log - access.log
- error.log - error.log
when: not ansible_check_mode
- name: "Install userlogrotate (jessie)" - name: "Install userlogrotate (jessie)"
copy: copy:

1
packweb-apache/tasks/multiphp.yml
View File

@ -5,7 +5,6 @@
state: present state: present
name: proxy_fcgi name: proxy_fcgi
notify: restart apache2 notify: restart apache2
when: not ansible_check_mode
- include_role: - include_role:
name: remount-usr name: remount-usr

5
packweb-apache/tasks/phpmyadmin.yml
View File

@ -65,12 +65,10 @@
changed_when: False changed_when: False
check_mode: no check_mode: no
register: new_packweb_phpmyadmin_suffix register: new_packweb_phpmyadmin_suffix
when: not ansible_check_mode
- name: overwrite packweb_phpmyadmin_suffix - name: overwrite packweb_phpmyadmin_suffix
set_fact: set_fact:
packweb_phpmyadmin_suffix: "{{ new_packweb_phpmyadmin_suffix.stdout }}" packweb_phpmyadmin_suffix: "{{ new_packweb_phpmyadmin_suffix.stdout }}"
when: not ansible_check_mode
- debug: - debug:
var: packweb_phpmyadmin_suffix var: packweb_phpmyadmin_suffix
@ -88,18 +86,15 @@
Require all denied Require all denied
Include /etc/apache2/ipaddr_whitelist.conf Include /etc/apache2/ipaddr_whitelist.conf
</Directory> </Directory>
when: not ansible_check_mode
- name: enable phpmyadmin link in default site index - name: enable phpmyadmin link in default site index
replace: replace:
dest: /var/www/index.html dest: /var/www/index.html
regexp: '<!-- <li><a href="/phpmyadmin-__PHPMYADMIN_SUFFIX__/">Accès PhpMyAdmin</a></li> -->' regexp: '<!-- <li><a href="/phpmyadmin-__PHPMYADMIN_SUFFIX__/">Accès PhpMyAdmin</a></li> -->'
replace: ' <li><a href="/phpmyadmin-__PHPMYADMIN_SUFFIX__/">Accès PhpMyAdmin</a></li>' replace: ' <li><a href="/phpmyadmin-__PHPMYADMIN_SUFFIX__/">Accès PhpMyAdmin</a></li>'
when: not ansible_check_mode
- name: replace phpmyadmin suffix in default site index - name: replace phpmyadmin suffix in default site index
replace: replace:
dest: /var/www/index.html dest: /var/www/index.html
regexp: '__PHPMYADMIN_SUFFIX__' regexp: '__PHPMYADMIN_SUFFIX__'
replace: "{{ packweb_phpmyadmin_suffix }}" replace: "{{ packweb_phpmyadmin_suffix }}"
when: not ansible_check_mode

5
php/handlers/main.yml
View File

@ -4,28 +4,23 @@
service: service:
name: php5-fpm name: php5-fpm
state: restarted state: restarted
when: not ansible_check_mode
- name: restart php7.0-fpm - name: restart php7.0-fpm
service: service:
name: php7.0-fpm name: php7.0-fpm
state: restarted state: restarted
when: not ansible_check_mode
- name: restart php7.3-fpm - name: restart php7.3-fpm
service: service:
name: php7.3-fpm name: php7.3-fpm
state: restarted state: restarted
when: not ansible_check_mode
- name: restart php7.4-fpm - name: restart php7.4-fpm
service: service:
name: php7.4-fpm name: php7.4-fpm
state: restarted state: restarted
when: not ansible_check_mode
- name: restart php8.1-fpm - name: restart php8.1-fpm
service: service:
name: php8.1-fpm name: php8.1-fpm
state: restarted state: restarted
when: not ansible_check_mode

5
php/tasks/config_cli.yml
View File

@ -25,7 +25,6 @@
file: file:
dest: "{{ php_cli_custom_ini_file }}" dest: "{{ php_cli_custom_ini_file }}"
mode: "0644" mode: "0644"
when: not ansible_check_mode
- name: "Set custom values for PHP to enable Symfony" - name: "Set custom values for PHP to enable Symfony"
ini_file: ini_file:
@ -36,6 +35,4 @@
mode: "0644" mode: "0644"
loop: loop:
- { option: "date.timezone", value: "Europe/Paris" } - { option: "date.timezone", value: "Europe/Paris" }
when: when: php_symfony_requirements | bool
- php_symfony_requirements | bool
- not ansible_check_mode

10
php/tasks/main_bookworm.yml
View File

@ -79,14 +79,12 @@
with_items: with_items:
- /etc/php - /etc/php
- /etc/php/{{ php_version }} - /etc/php/{{ php_version }}
when: not ansible_check_mode
- include: config_cli.yml - include: config_cli.yml
- name: "Enforce permissions on PHP cli directory (Debian 12)" - name: "Enforce permissions on PHP cli directory (Debian 12)"
file: file:
dest: /etc/php/{{ php_version }}/cli dest: /etc/php/{{ php_version }}/cli
mode: "0755" mode: "0755"
when: not ansible_check_mode
- include: config_fpm.yml - include: config_fpm.yml
when: php_fpm_enable when: php_fpm_enable
@ -95,9 +93,7 @@
file: file:
dest: /etc/php/{{ php_version }}/fpm dest: /etc/php/{{ php_version }}/fpm
mode: "0755" mode: "0755"
when: when: php_fpm_enable
- php_fpm_enable
- not ansible_check_mode
- include: config_apache.yml - include: config_apache.yml
when: php_apache_enable when: php_apache_enable
@ -106,9 +102,7 @@
file: file:
dest: /etc/php/{{ php_version }}/apache2 dest: /etc/php/{{ php_version }}/apache2
mode: "0755" mode: "0755"
when: when: php_apache_enable
- php_apache_enable
- not ansible_check_mode
- include: sury_post.yml - include: sury_post.yml
when: php_sury_enable when: php_sury_enable

10
php/tasks/main_bullseye.yml
View File

@ -68,14 +68,12 @@
with_items: with_items:
- /etc/php - /etc/php
- /etc/php/7.4 - /etc/php/7.4
when: not ansible_check_mode
- include: config_cli.yml - include: config_cli.yml
- name: "Enforce permissions on PHP cli directory (Debian 11)" - name: "Enforce permissions on PHP cli directory (Debian 11)"
file: file:
dest: /etc/php/7.4/cli dest: /etc/php/7.4/cli
mode: "0755" mode: "0755"
when: not ansible_check_mode
- include: config_fpm.yml - include: config_fpm.yml
when: php_fpm_enable when: php_fpm_enable
@ -84,9 +82,7 @@
file: file:
dest: /etc/php/7.4/fpm dest: /etc/php/7.4/fpm
mode: "0755" mode: "0755"
when: when: php_fpm_enable
- php_fpm_enable
- not ansible_check_mode
- include: config_apache.yml - include: config_apache.yml
when: php_apache_enable when: php_apache_enable
@ -95,9 +91,7 @@
file: file:
dest: /etc/php/7.4/apache2 dest: /etc/php/7.4/apache2
mode: "0755" mode: "0755"
when: when: php_apache_enable
- php_apache_enable
- not ansible_check_mode
- include: sury_post.yml - include: sury_post.yml
when: php_sury_enable when: php_sury_enable

10
php/tasks/main_buster.yml
View File

@ -68,14 +68,12 @@
loop: loop:
- /etc/php - /etc/php
- /etc/php/7.3 - /etc/php/7.3
when: not ansible_check_mode
- include: config_cli.yml - include: config_cli.yml
- name: "Enforce permissions on PHP cli directory (Debian 10)" - name: "Enforce permissions on PHP cli directory (Debian 10)"
file: file:
dest: /etc/php/7.3/cli dest: /etc/php/7.3/cli
mode: "0755" mode: "0755"
when: not ansible_check_mode
- include: config_fpm.yml - include: config_fpm.yml
when: php_fpm_enable | bool when: php_fpm_enable | bool
@ -84,9 +82,7 @@
file: file:
dest: /etc/php/7.3/fpm dest: /etc/php/7.3/fpm
mode: "0755" mode: "0755"
when: when: php_fpm_enable | bool
- php_fpm_enable | bool
- not ansible_check_mode
- include: config_apache.yml - include: config_apache.yml
when: php_apache_enable | bool when: php_apache_enable | bool
@ -95,9 +91,7 @@
file: file:
dest: /etc/php/7.3/apache2 dest: /etc/php/7.3/apache2
mode: "0755" mode: "0755"
when: when: php_apache_enable | bool
- php_apache_enable | bool
- not ansible_check_mode
- include: sury_post.yml - include: sury_post.yml
when: php_sury_enable | bool when: php_sury_enable | bool

10
php/tasks/main_jessie.yml
View File

@ -56,7 +56,6 @@
file: file:
dest: /etc/php5 dest: /etc/php5
mode: "0755" mode: "0755"
when: not ansible_check_mode
- include: config_cli.yml - include: config_cli.yml
@ -64,7 +63,6 @@
file: file:
dest: /etc/php5/cli dest: /etc/php5/cli
mode: "0755" mode: "0755"
when: not ansible_check_mode
- include: config_fpm.yml - include: config_fpm.yml
when: php_fpm_enable | bool when: php_fpm_enable | bool
@ -73,9 +71,7 @@
file: file:
dest: /etc/php5/fpm dest: /etc/php5/fpm
mode: "0755" mode: "0755"
when: when: php_fpm_enable | bool
- php_fpm_enable | bool
- not ansible_check_mode
- include: config_apache.yml - include: config_apache.yml
when: php_apache_enable | bool when: php_apache_enable | bool
@ -84,6 +80,4 @@
file: file:
dest: /etc/php5/apache2 dest: /etc/php5/apache2
mode: "0755" mode: "0755"
when: when: php_apache_enable | bool
- php_apache_enable | bool
- not ansible_check_mode

10
php/tasks/main_stretch.yml
View File

@ -68,7 +68,6 @@
loop: loop:
- /etc/php - /etc/php
- /etc/php/7.0 - /etc/php/7.0
when: not ansible_check_mode
- include: config_cli.yml - include: config_cli.yml
@ -76,7 +75,6 @@
file: file:
dest: /etc/php/7.0/cli dest: /etc/php/7.0/cli
mode: "0755" mode: "0755"
when: not ansible_check_mode
- include: config_fpm.yml - include: config_fpm.yml
when: php_fpm_enable | bool when: php_fpm_enable | bool
@ -85,9 +83,7 @@
file: file:
dest: /etc/php/7.0/fpm dest: /etc/php/7.0/fpm
mode: "0755" mode: "0755"
when: when: php_fpm_enable | bool
- php_fpm_enable | bool
- not ansible_check_mode
- include: config_apache.yml - include: config_apache.yml
when: php_apache_enable | bool when: php_apache_enable | bool
@ -96,9 +92,7 @@
file: file:
dest: /etc/php/7.0/apache2 dest: /etc/php/7.0/apache2
mode: "0755" mode: "0755"
when: when: php_apache_enable | bool
- php_apache_enable | bool
- not ansible_check_mode
- include: sury_post.yml - include: sury_post.yml
when: php_sury_enable | bool when: php_sury_enable | bool

9
php/tasks/sury_post.yml
View File

@ -14,7 +14,6 @@
file: file:
dest: /etc/php/7.4/cli dest: /etc/php/7.4/cli
mode: "0755" mode: "0755"
when: not ansible_check_mode
- name: Symlink Evolix Apache config files from 7.4 to 7.0 - name: Symlink Evolix Apache config files from 7.4 to 7.0
file: file:
@ -31,9 +30,7 @@
file: file:
dest: /etc/php/7.4/apache2 dest: /etc/php/7.4/apache2
mode: "0755" mode: "0755"
when: when: php_apache_enable | bool
- php_apache_enable | bool
- not ansible_check_mode
- name: Symlink Evolix FPM config files from 7.4 to 7.0 - name: Symlink Evolix FPM config files from 7.4 to 7.0
file: file:
@ -52,6 +49,4 @@
file: file:
dest: /etc/php/7.4/fpm dest: /etc/php/7.4/fpm
mode: "0755" mode: "0755"
when: when: php_fpm_enable | bool
- php_fpm_enable | bool
- not ansible_check_mode

1
proftpd/handlers/main.yml
View File

@ -3,4 +3,3 @@
service: service:
name: proftpd name: proftpd
state: restarted state: restarted
when: not ansible_check_mode

2
proftpd/tasks/main.yml
View File

@ -70,7 +70,6 @@
notify: restart proftpd notify: restart proftpd
tags: tags:
- proftpd - proftpd
when: not ansible_check_mode
- name: Put empty vpasswd file if missing - name: Put empty vpasswd file if missing
copy: copy:
@ -93,7 +92,6 @@
notify: restart proftpd notify: restart proftpd
tags: tags:
- proftpd - proftpd
when: not ansible_check_mode
- include: accounts.yml - include: accounts.yml
when: proftpd_accounts | length > 0 when: proftpd_accounts | length > 0

7
squid/handlers/main.yml
View File

@ -3,38 +3,31 @@
service: service:
name: munin-node name: munin-node
state: restarted state: restarted
when: not ansible_check_mode
- name: restart squid - name: restart squid
service: service:
name: squid name: squid
state: restarted state: restarted
when: not ansible_check_mode
- name: reload squid - name: reload squid
service: service:
name: squid name: squid
state: reloaded state: reloaded
when: not ansible_check_mode
- name: restart squid3 - name: restart squid3
service: service:
name: squid3 name: squid3
state: restarted state: restarted
when: not ansible_check_mode
- name: reload squid3 - name: reload squid3
service: service:
name: squid3 name: squid3
state: reloaded state: reloaded
when: not ansible_check_mode
- name: restart log2mail - name: restart log2mail
service: service:
name: log2mail name: log2mail
state: restarted state: restarted
when: not ansible_check_mode
- name: restart minifirewall - name: restart minifirewall
command: /etc/init.d/minifirewall restart command: /etc/init.d/minifirewall restart
when: not ansible_check_mode

1
squid/tasks/main.yml
View File

@ -121,7 +121,6 @@
when: when:
- squid_localproxy_enable | bool - squid_localproxy_enable | bool
- ansible_distribution_major_version is version('9', '>=') - ansible_distribution_major_version is version('9', '>=')
- not ansible_check_mode
- name: "evolinux custom overrides (Debian 9 or later)" - name: "evolinux custom overrides (Debian 9 or later)"
copy: copy:

1
webapps/evoadmin-web/tasks/ftp.yml
View File

@ -10,4 +10,3 @@
remote_src: False remote_src: False
src: ftp/evolinux.conf.diff src: ftp/evolinux.conf.diff
dest: /etc/proftpd/conf.d/z-evolinux.conf dest: /etc/proftpd/conf.d/z-evolinux.conf
when: not ansible_check_mode

5
webapps/evoadmin-web/tasks/main.yml
View File

@ -3,9 +3,7 @@
- name: "Ensure that evoadmin_contact_email is defined" - name: "Ensure that evoadmin_contact_email is defined"
fail: fail:
msg: Please configure var evoadmin_contact_email msg: Please configure var evoadmin_contact_email
when: when: evoadmin_contact_email is none or evoadmin_contact_email | length == 0
- evoadmin_contact_email is none or evoadmin_contact_email | length == 0
- not ansible_check_mode
- include: packages.yml - include: packages.yml
@ -25,4 +23,3 @@
marker: "<!-- {mark} evoadmin-web section -->" marker: "<!-- {mark} evoadmin-web section -->"
block: | block: |
<li><a href="https://{{ evoadmin_host }}">Interface admin web (EvoAdmin-web)</a></li> <li><a href="https://{{ evoadmin_host }}">Interface admin web (EvoAdmin-web)</a></li>
when: not ansible_check_mode

1
webapps/evoadmin-web/tasks/ssl.yml
View File

@ -17,7 +17,6 @@
owner: root owner: root
group: ssl-cert group: ssl-cert
mode: "0640" mode: "0640"
when: not ansible_check_mode
- name: Create certificate for default site - name: Create certificate for default site
command: openssl x509 -req -days 3650 -sha256 -in /etc/ssl/{{ evoadmin_host }}.csr -signkey /etc/ssl/private/{{ evoadmin_host }}.key -out /etc/ssl/certs/{{ evoadmin_host }}.crt command: openssl x509 -req -days 3650 -sha256 -in /etc/ssl/{{ evoadmin_host }}.csr -signkey /etc/ssl/private/{{ evoadmin_host }}.key -out /etc/ssl/certs/{{ evoadmin_host }}.crt

8
webapps/evoadmin-web/tasks/user.yml
View File

@ -54,9 +54,7 @@
dest: "{{ evoadmin_document_root }}" dest: "{{ evoadmin_document_root }}"
version: jessie version: jessie
update: False update: False
when: when: ansible_distribution_release == "jessie"
- ansible_distribution_release == "jessie"
- not ansible_check_mode
- name: "Clone evoadmin repository (Debian 9 or later)" - name: "Clone evoadmin repository (Debian 9 or later)"
git: git:
@ -64,9 +62,7 @@
dest: "{{ evoadmin_document_root }}" dest: "{{ evoadmin_document_root }}"
version: master version: master
update: False update: False
when: when: ansible_distribution_major_version is version('9', '>=')
- ansible_distribution_major_version is version('9', '>=')
- not ansible_check_mode
- name: Change ownership on git repository - name: Change ownership on git repository
file: file: