From 50f43dc601c32624d283f4d690fc213b64b93700 Mon Sep 17 00:00:00 2001
From: Defunct <defunct@defunct.io>
Date: Tue, 23 Aug 2016 02:02:57 +0000
Subject: [PATCH] revert systemd changes (2.2 only), identation normalization;

---
 roles/dns_adblocking/tasks/main.yml |  4 ++--
 roles/proxy/tasks/main.yml          | 10 +++++-----
 roles/security/tasks/main.yml       |  2 +-
 roles/vpn/handlers/main.yml         |  2 +-
 roles/vpn/tasks/main.yml            |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/roles/dns_adblocking/tasks/main.yml b/roles/dns_adblocking/tasks/main.yml
index 27dabe1..a74e455 100644
--- a/roles/dns_adblocking/tasks/main.yml
+++ b/roles/dns_adblocking/tasks/main.yml
@@ -7,7 +7,7 @@
 - name: Dnsmasq profile for apparmor configured
   template: src=usr.sbin.dnsmasq.j2 dest=/etc/apparmor.d/usr.sbin.dnsmasq owner=root group=root mode=0600
   notify:
-  - restart dnsmasq
+    - restart dnsmasq
   
 - name: The dnsmasq directory created
   file: dest=/var/lib/dnsmasq state=directory mode=755 owner=dnsmasq group=nogroup
@@ -18,7 +18,7 @@
 - name: Dnsmasq configured
   template: src=dnsmasq.conf.j2 dest=/etc/dnsmasq.conf
   notify:
-  - restart dnsmasq
+    - restart dnsmasq
 
 - name: Adblock script created
   template: src=adblock.sh dest=/opt/adblock.sh owner=root group=root mode=0755
diff --git a/roles/proxy/tasks/main.yml b/roles/proxy/tasks/main.yml
index ae062cf..e45124c 100644
--- a/roles/proxy/tasks/main.yml
+++ b/roles/proxy/tasks/main.yml
@@ -12,7 +12,7 @@
 - name: Privoxy profile for apparmor configured
   template: src=usr.sbin.privoxy.j2 dest=/etc/apparmor.d/usr.sbin.privoxy owner=root group=root mode=0600
   notify:
-  - restart privoxy
+    - restart privoxy
 
 - name: Enforce the privoxy AppArmor policy
   shell: aa-enforce usr.sbin.privoxy
@@ -36,7 +36,7 @@
 - name: PageSpeed configured
   template: src=pagespeed.conf.j2 dest=/etc/apache2/mods-available/pagespeed.conf
   notify:
-  - restart apache2
+    - restart apache2
 
 - name: Modules enabled
   apache2_module: state=present name="{{ item }}"
@@ -48,14 +48,14 @@
     - proxy_html
     - rewrite
   notify:
-  - restart apache2
+    - restart apache2
 
 - name: VirtualHost configured for the PageSpeed module
   template: src=000-default.conf.j2 dest=/etc/apache2/sites-enabled/000-default.conf
   notify:
-  - restart apache2
+    - restart apache2
 
 - name: Apache ports configured
   template: src=ports.conf.j2 dest=/etc/apache2/ports.conf
   notify:
-  - restart apache2
+    - restart apache2
diff --git a/roles/security/tasks/main.yml b/roles/security/tasks/main.yml
index fdd4818..10d31eb 100644
--- a/roles/security/tasks/main.yml
+++ b/roles/security/tasks/main.yml
@@ -99,4 +99,4 @@
     - { src: rules.v4.j2, dest: /etc/iptables/rules.v4 }
     - { src: rules.v6.j2, dest: /etc/iptables/rules.v6 }  
   notify:
-  - restart iptables
+    - restart iptables
diff --git a/roles/vpn/handlers/main.yml b/roles/vpn/handlers/main.yml
index 8abb32c..0a527a4 100644
--- a/roles/vpn/handlers/main.yml
+++ b/roles/vpn/handlers/main.yml
@@ -1,5 +1,5 @@
 - name: restart strongswan
-  systemd: name=strongswan state=restarted daemon_reload=yes
+  service: name=strongswan state=restarted daemon_reload=yes
 
 - name: restart apparmor
   service: name=apparmor state=restarted
diff --git a/roles/vpn/tasks/main.yml b/roles/vpn/tasks/main.yml
index 959861f..7957e42 100644
--- a/roles/vpn/tasks/main.yml
+++ b/roles/vpn/tasks/main.yml
@@ -75,7 +75,7 @@
     chdir: '{{ easyrsa_dir }}/easyrsa3/'
     creates: '{{ easyrsa_dir }}/easyrsa3/pki/ca_initialized'
   notify:
-  - restart strongswan
+    - restart strongswan
 
 - name: Build the server pair
   shell: >
@@ -85,7 +85,7 @@
     chdir: '{{ easyrsa_dir }}/easyrsa3/'
     creates: '{{ easyrsa_dir }}/easyrsa3/pki/server_initialized'
   notify:
-  - restart strongswan
+    - restart strongswan
 
 - name: Build the client's pair
   shell: >