aboutsummaryrefslogtreecommitdiff
path: root/ansible/roles
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-07-05 19:49:32 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-07-05 19:49:32 +0200
commit03d4e50b0508a292a7d24cc0e4cd4327118050d8 (patch)
tree457d5885057ce19745c791d6699e1a388c774986 /ansible/roles
parenteac2581a20b102e7464f8b06c13b4aade46fcb2f (diff)
downloadinfrastructure-03d4e50b0508a292a7d24cc0e4cd4327118050d8.tar.gz
infrastructure-03d4e50b0508a292a7d24cc0e4cd4327118050d8.zip
Add my own modifications
Diffstat (limited to 'ansible/roles')
-rw-r--r--ansible/roles/common/tasks/main.yml6
-rw-r--r--ansible/roles/network/handlers/main.yml6
-rw-r--r--ansible/roles/network/tasks/main.yml8
3 files changed, 6 insertions, 14 deletions
diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
index b4d00bb..0b15790 100644
--- a/ansible/roles/common/tasks/main.yml
+++ b/ansible/roles/common/tasks/main.yml
@@ -12,6 +12,12 @@
autoclean: yes
autoremove: yes
+- name: "Remove base tools"
+ apt:
+ name:
+ - systemd-resolved
+ state: absent
+
- name: "Install base tools"
apt:
name:
diff --git a/ansible/roles/network/handlers/main.yml b/ansible/roles/network/handlers/main.yml
deleted file mode 100644
index 1c72d85..0000000
--- a/ansible/roles/network/handlers/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: reload iptables
- shell: iptables-restore < /etc/iptables/rules.v4 && systemctl restart docker
-
-- name: reload ip6tables
- shell: ip6tables-restore < /etc/iptables/rules.v6
diff --git a/ansible/roles/network/tasks/main.yml b/ansible/roles/network/tasks/main.yml
index ee2f21e..e0cf60c 100644
--- a/ansible/roles/network/tasks/main.yml
+++ b/ansible/roles/network/tasks/main.yml
@@ -1,12 +1,8 @@
- name: "Deploy iptablesv4 configuration"
template: src=rules.v4.j2 dest=/etc/iptables/rules.v4
- notify:
- - reload iptables
- name: "Deploy iptablesv6 configuration"
copy: src=rules.v6 dest=/etc/iptables/rules.v6
- notify:
- - reload ip6tables
- name: "Activate IP forwarding"
sysctl:
@@ -14,10 +10,6 @@
value: 1
sysctl_set: yes
-- name: "Flush handlers"
- meta: flush_handlers
-
-
# These two lines are used to undo previous config, remove them once it is done
- name: "Update nsswitch.conf to not use systemd-resolved"
copy: src=nsswitch.conf dest=/etc/nsswitch.conf