diff --git a/group_vars/fet_hosts b/group_vars/fet_hosts index cff452c..39bddba 100644 --- a/group_vars/fet_hosts +++ b/group_vars/fet_hosts @@ -28,3 +28,27 @@ common_basic_packages: - gdisk - cryptsetup - nvme-cli + +common_sysctl: True +common_sysctls: +#- key: net.ipv6.conf.all.disable_ipv6 +# val: 1 +- key: net.ipv4.conf.default.rp_filter + val: 1 +- key: net.ipv4.conf.all.rp_filter + val: 1 + +- key: net.ipv4.conf.all.accept_redirects + val: 0 +- key: net.ipv4.conf.default.accept_redirects + val: 0 +- key: net.ipv6.conf.all.accept_redirects + val: 0 +- key: net.ipv6.conf.default.accept_redirects + val: 0 + +- key: net.ipv4.conf.all.send_redirects + val: 0 + +- key: net.ipv4.conf.default.accept_source_route + val: 0 diff --git a/roles/ariane/defaults/main.yml b/roles/ariane/defaults/main.yml index 3612bbf..b01aa21 100644 --- a/roles/ariane/defaults/main.yml +++ b/roles/ariane/defaults/main.yml @@ -1,28 +1,4 @@ --- -ariane_sysctl: True -ariane_sysctls: -#- key: net.ipv6.conf.all.disable_ipv6 -# val: 1 -- key: net.ipv4.conf.default.rp_filter - val: 1 -- key: net.ipv4.conf.all.rp_filter - val: 1 - -- key: net.ipv4.conf.all.accept_redirects - val: 0 -- key: net.ipv4.conf.default.accept_redirects - val: 0 -- key: net.ipv6.conf.all.accept_redirects - val: 0 -- key: net.ipv6.conf.default.accept_redirects - val: 0 - -- key: net.ipv4.conf.all.send_redirects - val: 0 - -- key: net.ipv4.conf.default.accept_source_route - val: 0 - ariane_logrotate: True ariane_iptables: True ariane_zfs: True diff --git a/roles/ariane/tasks/main.yml b/roles/ariane/tasks/main.yml index 5f1ae4c..ba0f2d4 100644 --- a/roles/ariane/tasks/main.yml +++ b/roles/ariane/tasks/main.yml @@ -1,8 +1,4 @@ --- -- import_tasks: sysctl.yml - when: ariane_sysctl - tags: ['ariane_sysctl', 'sysctl'] - - import_tasks: logrotate.yml when: ariane_logrotate tags: ['ariane_logrotate', 'logrotate'] diff --git a/roles/ariane/tasks/sysctl.yml b/roles/ariane/tasks/sysctl.yml deleted file mode 100644 index 51302a9..0000000 --- a/roles/ariane/tasks/sysctl.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: sysctl - sysctl.d - file: path=/etc/sysctl.d state=directory owner=root group=root mode=0755 - -- name: sysctl - set config - sysctl: - name: "{{ item.key }}" - value: "{{ item.val }}" - sysctl_file: /etc/sysctl.d/01-custom.conf - with_items: "{{ ariane_sysctls }}" diff --git a/roles/common b/roles/common index 01603d2..1a0adb2 160000 --- a/roles/common +++ b/roles/common @@ -1 +1 @@ -Subproject commit 01603d2043c2d1ded1ec4044eeffc1b2234cc6c3 +Subproject commit 1a0adb219d09108f3f80748b9056e6215e8cad43