From 2c0a9857bcc0f3b514e4edc909dca1a37c6a7536 Mon Sep 17 00:00:00 2001
From: staticsafe <me@staticsafe.ca>
Date: Wed, 7 May 2014 14:32:38 +0000
Subject: [PATCH] Separate handlers into its own file.

---
 debian/roles/common/handlers/main.yml |  6 +++
 debian/roles/common/tasks/main.yml    | 56 ++++++++++++---------------
 2 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 debian/roles/common/handlers/main.yml

diff --git a/debian/roles/common/handlers/main.yml b/debian/roles/common/handlers/main.yml
new file mode 100644
index 0000000..9395ddd
--- /dev/null
+++ b/debian/roles/common/handlers/main.yml
@@ -0,0 +1,6 @@
+---
+- name: restart rsyslog
+  service: name=rsyslog state=restarted
+- name: restart cron
+  service: name=cron state=restarted
+
diff --git a/debian/roles/common/tasks/main.yml b/debian/roles/common/tasks/main.yml
index 2803bed..949d232 100644
--- a/debian/roles/common/tasks/main.yml
+++ b/debian/roles/common/tasks/main.yml
@@ -1,32 +1,26 @@
 ---
-- user: root
-  hosts: unsetup
-  tasks:
-  - name: Install python-apt, aptitude, and debconf-utils
-    shell: apt-get update && apt-get -y install python-apt aptitude debconf-utils
-  - name: Do any package upgrades
-    apt: upgrade=dist
-  - name: Set default locale to en_US.UTF-8
-    debconf: name=locales question='locales/default_environment_locale' value=en_US.UTF-8 vtype='select'
-  - name: Generate locales
-    debconf: name=locales question='locales/locales_to_be_generated'  value='en_US.UTF-8 UTF-8' vtype='multiselect'
-  - name: Choose timezone area
-    debconf: name=tzdata question='tzdata/Areas' value='Etc' vtype='select'
-    debconf: name=tzdata question='tzdata/Zones/Etc' value='UTC' vtype='select'
-    notify:
-    - restart rsyslog
-    - restart cron
-  - name: Install required packages
-    apt: pkg=most,zsh,vim,vim-scripts,git,subversion,tmux,multitail,mtr-tiny,curl,dnsutils,sudo,gnupg,traceroute,htop,haveged,python-pip,unbound state=present
-  - name: Remove exim4
-    apt: pkg=exim4-daemon-light state=absent
-  - name: Ensure haveged and unbound are started on boot
-    service: name=haveged enabled=yes
-    service: name=unbound enabled=yes
-  - name: use local unbound instance for DNS
-    shell: echo "nameserver ::1" > /etc/resolv.conf
-  handlers:
-    - name: restart rsyslog
-      service: name=rsyslog state=restarted
-    - name: restart cron
-      service: name=cron state=restarted
+# This playbook contains common plays that will be run all nodes.
+
+- name: Install python-apt, aptitude, and debconf-utils
+  shell: apt-get update && apt-get -y install python-apt aptitude debconf-utils
+- name: Do any package upgrades
+  apt: upgrade=dist
+- name: Set default locale to en_US.UTF-8
+  debconf: name=locales question='locales/default_environment_locale' value=en_US.UTF-8 vtype='select'
+- name: Generate locales
+  debconf: name=locales question='locales/locales_to_be_generated'  value='en_US.UTF-8 UTF-8' vtype='multiselect'
+- name: Choose timezone area
+  debconf: name=tzdata question='tzdata/Areas' value='Etc' vtype='select'
+  debconf: name=tzdata question='tzdata/Zones/Etc' value='UTC' vtype='select'
+  notify:
+  - restart rsyslog
+  - restart cron
+- name: Install required packages
+  apt: pkg=most,zsh,vim,vim-scripts,git,subversion,tmux,multitail,mtr-tiny,curl,dnsutils,sudo,gnupg,traceroute,htop,haveged,python-pip,unbound state=present
+- name: Remove exim4
+  apt: pkg=exim4-daemon-light state=absent
+- name: Ensure haveged and unbound are started on boot
+  service: name=haveged enabled=yes
+  service: name=unbound enabled=yes
+- name: use local unbound instance for DNS
+  shell: echo "nameserver ::1" > /etc/resolv.conf