diff --git a/clamav/tasks/main.yml b/clamav/tasks/main.yml index be9e5b00..6d1da3eb 100644 --- a/clamav/tasks/main.yml +++ b/clamav/tasks/main.yml @@ -6,48 +6,48 @@ value: "{{ item.value }}" vtype: "{{ item.type }}" loop: - - { key: 'clamav-daemon/debconf', type: 'boolean', value: 'true' } - - { key: 'clamav-daemon/MaxHTMLNormalize', type: 'string', value: '10M' } - - { key: 'clamav-daemon/StatsPEDisabled', type: 'boolean', value: 'true' } - - { key: 'clamav-daemon/FollowDirectorySymlinks', type: 'boolean', value: 'false' } - - { key: 'clamav-daemon/StreamMaxLength', type: 'string', value: '25' } - - { key: 'clamav-daemon/ReadTimeout', type: 'string', value: '180' } - - { key: 'clamav-daemon/StatsEnabled', type: 'boolean', value: 'false' } - - { key: 'clamav-daemon/MaxConnectionQueueLength', type: 'string', value: '15' } - - { key: 'clamav-daemon/LogRotate', type: 'boolean', value: 'true' } - - { key: 'clamav-daemon/AllowAllMatchScan', type: 'boolean', value: 'true' } - - { key: 'clamav-daemon/ScanOnAccess', type: 'boolean', value: 'false' } - - { key: 'clamav-daemon/LogFile', type: 'string', value: '/var/log/clamav/clamav.log' } - - { key: 'clamav-daemon/ScanMail', type: 'boolean', value: 'true' } - - { key: 'clamav-daemon/BytecodeTimeout', type: 'string', value: '60000' } - - { key: 'clamav-daemon/LogTime', type: 'boolean', value: 'true' } - - { key: 'clamav-daemon/OnAccessMaxFileSize', type: 'string', value: '5M' } - - { key: 'clamav-daemon/TcpOrLocal', type: 'select', value: 'UNIX' } - - { key: 'clamav-daemon/MaxEmbeddedPE', type: 'string', value: '10M' } - - { key: 'clamav-daemon/FixStaleSocket', type: 'boolean', value: 'true' } - - { key: 'clamav-daemon/User', type: 'string', value: 'clamav' } - - { key: 'clamav-daemon/BytecodeSecurity', type: 'select', value: 'TrustSigned' } - - { key: 'clamav-daemon/ScanSWF', type: 'boolean', value: 'true' } - - { key: 'clamav-daemon/MaxDirectoryRecursion', type: 'string', value: '0' } - - { key: 'clamav-daemon/MaxThreads', type: 'string', value: '12' } - - { key: 'clamav-daemon/LocalSocketGroup', type: 'string', value: 'clamav' } - - { key: 'clamav-daemon/MaxScriptNormalize', type: 'string', value: '5M' } - - { key: 'clamav-daemon/ForceToDisk', type: 'boolean', value: 'false' } - - { key: 'clamav-daemon/StatsHostID', type: 'string', value: 'auto' } - - { key: 'clamav-daemon/FollowFileSymlinks', type: 'boolean', value: 'false' } - - { key: 'clamav-daemon/TCPSocket', type: 'string', value: '3310' } - - { key: 'clamav-daemon/TCPAddr', type: 'string', value: 'any' } - - { key: 'clamav-daemon/DisableCertCheck', type: 'boolean', value: 'false' } - - { key: 'clamav-daemon/SelfCheck', type: 'string', value: '3600' } - - { key: 'clamav-daemon/LocalSocket', type: 'string', value: '/var/run/clamav/clamd.ctl' } - - { key: 'clamav-daemon/LocalSocketMode', type: 'string', value: '666' } - - { key: 'clamav-daemon/StatsTimeout', type: 'string', value: '10' } - - { key: 'clamav-daemon/MaxZipTypeRcg', type: 'string', value: '1M' } - - { key: 'clamav-daemon/MaxHTMLNoTags', type: 'string', value: '2M' } - - { key: 'clamav-daemon/LogSyslog', type: 'boolean', value: 'false' } - - { key: 'clamav-daemon/AddGroups', type: 'string', value: '' } - - { key: 'clamav-daemon/Bytecode', type: 'boolean', value: 'true' } - - { key: 'clamav-daemon/ScanArchive', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/debconf', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/MaxHTMLNormalize', type: 'string', value: '10M' } + - { key: 'clamav-daemon/StatsPEDisabled', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/FollowDirectorySymlinks', type: 'boolean', value: 'false' } + - { key: 'clamav-daemon/StreamMaxLength', type: 'string', value: '25' } + - { key: 'clamav-daemon/ReadTimeout', type: 'string', value: '180' } + - { key: 'clamav-daemon/StatsEnabled', type: 'boolean', value: 'false' } + - { key: 'clamav-daemon/MaxConnectionQueueLength', type: 'string', value: '15' } + - { key: 'clamav-daemon/LogRotate', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/AllowAllMatchScan', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/ScanOnAccess', type: 'boolean', value: 'false' } + - { key: 'clamav-daemon/LogFile', type: 'string', value: '/var/log/clamav/clamav.log' } + - { key: 'clamav-daemon/ScanMail', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/BytecodeTimeout', type: 'string', value: '60000' } + - { key: 'clamav-daemon/LogTime', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/OnAccessMaxFileSize', type: 'string', value: '5M' } + - { key: 'clamav-daemon/TcpOrLocal', type: 'select', value: 'UNIX' } + - { key: 'clamav-daemon/MaxEmbeddedPE', type: 'string', value: '10M' } + - { key: 'clamav-daemon/FixStaleSocket', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/User', type: 'string', value: 'clamav' } + - { key: 'clamav-daemon/BytecodeSecurity', type: 'select', value: 'TrustSigned' } + - { key: 'clamav-daemon/ScanSWF', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/MaxDirectoryRecursion', type: 'string', value: '0' } + - { key: 'clamav-daemon/MaxThreads', type: 'string', value: '12' } + - { key: 'clamav-daemon/LocalSocketGroup', type: 'string', value: 'clamav' } + - { key: 'clamav-daemon/MaxScriptNormalize', type: 'string', value: '5M' } + - { key: 'clamav-daemon/ForceToDisk', type: 'boolean', value: 'false' } + - { key: 'clamav-daemon/StatsHostID', type: 'string', value: 'auto' } + - { key: 'clamav-daemon/FollowFileSymlinks', type: 'boolean', value: 'false' } + - { key: 'clamav-daemon/TCPSocket', type: 'string', value: '3310' } + - { key: 'clamav-daemon/TCPAddr', type: 'string', value: 'any' } + - { key: 'clamav-daemon/DisableCertCheck', type: 'boolean', value: 'false' } + - { key: 'clamav-daemon/SelfCheck', type: 'string', value: '3600' } + - { key: 'clamav-daemon/LocalSocket', type: 'string', value: '/var/run/clamav/clamd.ctl' } + - { key: 'clamav-daemon/LocalSocketMode', type: 'string', value: '666' } + - { key: 'clamav-daemon/StatsTimeout', type: 'string', value: '10' } + - { key: 'clamav-daemon/MaxZipTypeRcg', type: 'string', value: '1M' } + - { key: 'clamav-daemon/MaxHTMLNoTags', type: 'string', value: '2M' } + - { key: 'clamav-daemon/LogSyslog', type: 'boolean', value: 'false' } + - { key: 'clamav-daemon/AddGroups', type: 'string', value: '' } + - { key: 'clamav-daemon/Bytecode', type: 'boolean', value: 'true' } + - { key: 'clamav-daemon/ScanArchive', type: 'boolean', value: 'true' } tags: - clamav @@ -58,17 +58,17 @@ value: "{{ item.value }}" vtype: "{{ item.type }}" loop: - - { key: 'clamav-freshclam/autoupdate_freshclam', type: 'select', value: 'daemon' } - - { key: 'clamav-freshclam/proxy_user', type: 'string', value: '' } - - { key: 'clamav-freshclam/NotifyClamd', type: 'boolean', value: 'true' } - - { key: 'clamav-freshclam/local_mirror', type: 'select', value: 'db.fr.clamav.net' } - - { key: 'clamav-freshclam/http_proxy', type: 'string', value: '' } - - { key: 'clamav-freshclam/LogRotate', type: 'boolean', value: 'true' } - - { key: 'clamav-freshclam/Bytecode', type: 'boolean', value: 'true' } - - { key: 'clamav-freshclam/update_interval', type: 'string', value: '24' } - - { key: 'clamav-freshclam/SafeBrowsing', type: 'boolean', value: 'false' } - - { key: 'clamav-freshclam/PrivateMirror', type: 'string', value: '' } - - { key: 'clamav-freshclam/internet_interface', type: 'string', value: '' } + - { key: 'clamav-freshclam/autoupdate_freshclam', type: 'select', value: 'daemon' } + - { key: 'clamav-freshclam/proxy_user', type: 'string', value: '' } + - { key: 'clamav-freshclam/NotifyClamd', type: 'boolean', value: 'true' } + - { key: 'clamav-freshclam/local_mirror', type: 'select', value: 'db.fr.clamav.net' } + - { key: 'clamav-freshclam/http_proxy', type: 'string', value: '' } + - { key: 'clamav-freshclam/LogRotate', type: 'boolean', value: 'true' } + - { key: 'clamav-freshclam/Bytecode', type: 'boolean', value: 'true' } + - { key: 'clamav-freshclam/update_interval', type: 'string', value: '24' } + - { key: 'clamav-freshclam/SafeBrowsing', type: 'boolean', value: 'false' } + - { key: 'clamav-freshclam/PrivateMirror', type: 'string', value: '' } + - { key: 'clamav-freshclam/internet_interface', type: 'string', value: '' } tags: - clamav diff --git a/evolinux-base/tasks/kernel.yml b/evolinux-base/tasks/kernel.yml index b49968f1..6ddeb57f 100644 --- a/evolinux-base/tasks/kernel.yml +++ b/evolinux-base/tasks/kernel.yml @@ -8,8 +8,8 @@ state: present reload: yes loop: - - { name: kernel.panic_on_oops, value: 1 } - - { name: kernel.panic, value: 60 } + - { name: kernel.panic_on_oops, value: 1 } + - { name: kernel.panic, value: 60 } when: evolinux_kernel_reboot_after_panic | bool - name: Don't reboot after panic @@ -19,8 +19,8 @@ state: absent reload: yes loop: - - kernel.panic_on_oops - - kernel.panic + - kernel.panic_on_oops + - kernel.panic when: not evolinux_kernel_reboot_after_panic | bool - name: Disable net.ipv4.tcp_timestamps diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml index 554bb02a..486dc2e8 100644 --- a/evolinux-base/tasks/system.yml +++ b/evolinux-base/tasks/system.yml @@ -119,10 +119,10 @@ regexp: "{{ item.regexp }}" replace: "{{ item.replace }}" loop: - - { regexp: '^17((\s*\*){4})', replace: '{{ 59|random(start=1) }}\1' } - - { regexp: '^25\s*6((\s*\*){3})', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' } - - { regexp: '^47\s*6((\s*\*){2}\s*7)', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' } - - { regexp: '^52\s*6(\s*1(\s*\*){2})', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' } + - { regexp: '^17((\s*\*){4})', replace: '{{ 59|random(start=1) }}\1' } + - { regexp: '^25\s*6((\s*\*){3})', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' } + - { regexp: '^47\s*6((\s*\*){2}\s*7)', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' } + - { regexp: '^52\s*6(\s*1(\s*\*){2})', replace: '{{ 59|random(start=1) }} {{ [0,1,3,4,5,6,7]|random }}\1' } when: - is_cron_installed.rc == 0 - evolinux_system_cron_random | bool diff --git a/java/tasks/oracle.yml b/java/tasks/oracle.yml index c2ab5ebf..0b057695 100644 --- a/java/tasks/oracle.yml +++ b/java/tasks/oracle.yml @@ -14,9 +14,9 @@ state: directory mode: "0777" loop: - - /srv/java-package - - /srv/java-package/src - - /srv/java-package/tmp + - /srv/java-package + - /srv/java-package/src + - /srv/java-package/tmp tags: - java diff --git a/kvm-host/tasks/ssh.yml b/kvm-host/tasks/ssh.yml index fe71c287..c48722a3 100644 --- a/kvm-host/tasks/ssh.yml +++ b/kvm-host/tasks/ssh.yml @@ -34,8 +34,7 @@ special_time: "hourly" user: root job: "rsync -a --delete /etc/libvirt/qemu/ {{ hostvars[item]['ansible_hostname'] }}:/root/libvirt-{{ inventory_hostname }}/" - loop: - - "{{ groups['hypervisors'] }}" + loop: "{{ groups['hypervisors'] }}" when: item != inventory_hostname - name: Crontab for sync list of running vm @@ -45,6 +44,5 @@ special_time: "daily" user: root job: "virsh list --all | ssh {{ hostvars[item]['ansible_hostname'] }} 'cat >/root/libvirt-{{ inventory_hostname }}/virsh-list.txt'" - loop: - - "{{ groups['hypervisors'] }}" + loop: "{{ groups['hypervisors'] }}" when: item != inventory_hostname diff --git a/lxc-solr/tasks/main.yml b/lxc-solr/tasks/main.yml index 3fad863f..d629bbf6 100644 --- a/lxc-solr/tasks/main.yml +++ b/lxc-solr/tasks/main.yml @@ -8,9 +8,7 @@ path: "/var/lib/lxc/{{ item.name }}/rootfs" state: directory mode: '0755' - loop: - - "{{ lxc_containers }}" + loop: "{{ lxc_containers }}" - include: "solr.yml name={{item.name}} solr_version={{item.solr_version}} solr_port={{item.solr_port}}" - loop: - - "{{ lxc_containers }}" + loop: "{{ lxc_containers }}" diff --git a/opendkim/tasks/main.yml b/opendkim/tasks/main.yml index 1db961e2..94aa3dfd 100644 --- a/opendkim/tasks/main.yml +++ b/opendkim/tasks/main.yml @@ -39,8 +39,8 @@ group: opendkim mode: "0640" loop: - - 'KeyTable' - - 'SigningTable' + - 'KeyTable' + - 'SigningTable' changed_when: False tags: - opendkim diff --git a/postfix/tasks/packmail.yml b/postfix/tasks/packmail.yml index 80f90232..90d424b2 100644 --- a/postfix/tasks/packmail.yml +++ b/postfix/tasks/packmail.yml @@ -38,17 +38,17 @@ dest: "/etc/postfix/{{ item }}" force: no loop: - - virtual - - client.access - - client.access_local - - header_kill - - header_kill_local - - recipient.access - - recipient.access_local - - sa-blacklist.access - - sender.access - - sender.access_local - - spamd.cidr + - virtual + - client.access + - client.access_local + - header_kill + - header_kill_local + - recipient.access + - recipient.access_local + - sa-blacklist.access + - sender.access + - sender.access_local + - spamd.cidr register: postfix_copy_filter tags: - postfix @@ -56,17 +56,17 @@ - name: postmap filter files command: "postmap /etc/postfix/{{ item }}" loop: - - virtual - - client.access - - client.access_local - - header_kill - - header_kill_local - - recipient.access - - recipient.access_local - - sa-blacklist.access - - sender.access - - sender.access_local - - spamd.cidr + - virtual + - client.access + - client.access_local + - header_kill + - header_kill_local + - recipient.access + - recipient.access_local + - sa-blacklist.access + - sender.access + - sender.access_local + - spamd.cidr when: postfix_copy_filter is changed tags: - postfix diff --git a/postgresql/tasks/munin.yml b/postgresql/tasks/munin.yml index 4e62ddf6..ed2cc883 100644 --- a/postgresql/tasks/munin.yml +++ b/postgresql/tasks/munin.yml @@ -15,11 +15,11 @@ src: '/usr/share/munin/plugins/{{item}}' dest: '/etc/munin/plugins/{{item}}' loop: - - postgres_bgwriter - - postgres_checkpoints - - postgres_connections_db - - postgres_users - - postgres_xlog + - postgres_bgwriter + - postgres_checkpoints + - postgres_connections_db + - postgres_users + - postgres_xlog notify: restart munin-node when: etc_munin_plugins.stat.exists and usr_share_munin_plugins.stat.exists diff --git a/postgresql/tasks/packages_jessie.yml b/postgresql/tasks/packages_jessie.yml index cf8f0879..b9f9b31b 100644 --- a/postgresql/tasks/packages_jessie.yml +++ b/postgresql/tasks/packages_jessie.yml @@ -12,6 +12,6 @@ apt: name: '{{item}}' loop: - - "postgresql-{{postgresql_version}}" - - ptop - - libdbd-pg-perl + - "postgresql-{{postgresql_version}}" + - ptop + - libdbd-pg-perl diff --git a/redmine/tasks/config.yml b/redmine/tasks/config.yml index d65f8172..e45bcea5 100644 --- a/redmine/tasks/config.yml +++ b/redmine/tasks/config.yml @@ -7,9 +7,9 @@ owner: "{{ redmine_user }}" group: "{{ redmine_user }}" loop: - - ".config" - - ".config/systemd" - - ".config/systemd/user" + - ".config" + - ".config/systemd" + - ".config/systemd/user" tags: - redmine diff --git a/vrrpd/tasks/main.yml b/vrrpd/tasks/main.yml index 84d4f4ee..74dfa5c2 100644 --- a/vrrpd/tasks/main.yml +++ b/vrrpd/tasks/main.yml @@ -19,11 +19,11 @@ sysctl_set: yes state: present loop: - - { name: 'net.ipv4.conf.default.rp_filter', value: 0 } - - { name: 'net.ipv4.conf.eth0.rp_filter', value: 0 } - - { name: 'net.ipv4.conf.all.rp_filter', value: 0 } - - { name: 'net.ipv4.conf.all.arp_ignore', value: 1 } - - { name: 'net.ipv4.conf.all.arp_announce', value: 2 } - - { name: 'net.ipv4.ip_nonlocal_bind', value: 1 } + - { name: 'net.ipv4.conf.default.rp_filter', value: 0 } + - { name: 'net.ipv4.conf.eth0.rp_filter', value: 0 } + - { name: 'net.ipv4.conf.all.rp_filter', value: 0 } + - { name: 'net.ipv4.conf.all.arp_ignore', value: 1 } + - { name: 'net.ipv4.conf.all.arp_announce', value: 2 } + - { name: 'net.ipv4.ip_nonlocal_bind', value: 1 } tags: - vrrpd diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml index 68ac91de..bbad1b8f 100644 --- a/webapps/evoadmin-web/tasks/user.yml +++ b/webapps/evoadmin-web/tasks/user.yml @@ -38,10 +38,8 @@ regexp: "{{ item.regexp }}" state: present loop: - - line: 'evoadmin: root' - regexp: '^evoadmin:' - - line: 'www-evoadmin: root' - regexp: '^www-evoadmin:' + - { line: 'evoadmin: root', regexp: '^evoadmin:' } + - { line: 'www-evoadmin: root', regexp: '^www-evoadmin:' } notify: "newaliases" when: etc_aliases.stat.exists