Merge pull request #13 from craighurley/develop

Develop
craighurley · Jul 24, 2015 · 41e69e9 · 41e69e9
2 parents 7f597c9 + 2a0e82f
commit 41e69e9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/firewall/tasks/main.yml b/firewall/tasks/main.yml
@@ -1,11 +1,24 @@
 ---
-- name: disable ipv6
+- name: disable ipv6 in /etc/sysctl.conf
   lineinfile: dest=/etc/sysctl.conf
-    line="net.ipv6.conf.all.disable_ipv6 = 1"
+    line="{{ item }}"
+  with_items:
+    - "net.ipv6.conf.all.disable_ipv6 = 1"
+    - "net.ipv6.conf.default.disable_ipv6 = 1"
   notify:
     - reload sysctl.conf
   tags:
     - firewall
+    - ipv6
+
+- name: remove references to ipv6 in /etc/hosts
+  replace: dest=/etc/hosts
+    regexp='^(::1)(\s+.*)?$'
+    replace='#\1\2'
+    backup=yes
+  tags:
+    - firewall
+    - ipv6
 
 - name: install iptables services
   yum: name=iptables-services state=present

diff --git a/yum-common/defaults/main.yml b/yum-common/defaults/main.yml
@@ -17,7 +17,7 @@ v_yum_cron_update_cmd_hourly: "security"
 v_yum_cron_update_messages: "yes"
 v_yum_cron_download_updates: "yes"
 v_yum_cron_apply_updates: "yes"
-v_yum_cron_random_sleep: 360
+v_yum_cron_random_sleep: 0
 v_yum_cron_emit_via: "email"
 v_yum_cron_email_from: "root@localhost"
 v_yum_cron_email_to: "root"

diff --git a/yum-common/tasks/main.yml b/yum-common/tasks/main.yml
@@ -47,3 +47,4 @@
     - restart yum-cron
   tags:
     - yum
+    - yum-cron
diff --git a/yum-common/templates/yum-cron-hourly.conf.j2 b/yum-common/templates/yum-cron-hourly.conf.j2
@@ -27,7 +27,6 @@ apply_updates = {{ v_yum_cron_apply_updates }}
 # minutes before running.  This is useful for e.g. staggering the
 # times that multiple systems will access update servers.  If
 # random_sleep is 0 or negative, the program will run immediately.
-# 6*60 = 360
 random_sleep = {{ v_yum_cron_random_sleep }}
 
 

diff --git a/yum-common/templates/yum-cron.conf.j2 b/yum-common/templates/yum-cron.conf.j2
@@ -26,7 +26,6 @@ apply_updates = {{ v_yum_cron_apply_updates }}
 # minutes before running.  This is useful for e.g. staggering the
 # times that multiple systems will access update servers.  If
 # random_sleep is 0 or negative, the program will run immediately.
-# 6*60 = 360
 random_sleep = {{ v_yum_cron_random_sleep }}