From 2e49e24d13c0b2119b0cb2ccbda668f94f58955d Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 13 Jan 2020 11:11:46 -0500
Subject: [PATCH] Clean 1-prep/tasks/main.yml

---
 roles/1-prep/tasks/main.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml
index 9cdb8ebd6..57ee5b52b 100644
--- a/roles/1-prep/tasks/main.yml
+++ b/roles/1-prep/tasks/main.yml
@@ -55,9 +55,9 @@
   copy:
     src: roles/1-prep/files/iiab.conf
     dest: /etc/tmpfiles.d/
-    owner: root
-    group: root
-    mode: 0644
+    # owner: root
+    # group: root
+    # mode: '0644'
     force: yes
   when: grep_ubermix.rc == 0    # 1 if absent in file, 2 if file doesn't exist
   #when: ro_dir.stat.exists
@@ -66,27 +66,26 @@
   include_role:
     name: sshd
   # has no "when: XXXXX_install" flag
-  tags: base, sshd
+  #tags: base, sshd
 
 - name: IIAB-ADMIN
   include_role:
     name: iiab-admin
   # has no "when: XXXXX_install" flag
-  tags: base, iiab-admin
+  #tags: base, iiab-admin
 
 - name: OPENVPN
   include_role:
     name: openvpn
   when: openvpn_install | bool
-  tags: openvpn
+  #tags: openvpn
 
 # for rpi, without rtc, we need time as soon as possible
 - name: Install chrony (an NTP package) especially for RPi's lacking RTC
   package:
     name: chrony
     state: present
-  tags:
-    - download
+  #tags: download
 
 #TODO: Use regexp filter instead of hard-code ip
 - name: Install /etc/chrony.conf from template
@@ -102,7 +101,7 @@
 # Curiously this has NOT stopped IIAB 7.0/master from working on Debian 10
 # pre-releases, during @floydianslips' March 2019 testing anyway!  SEE #1387
 - name: Disable AppArmor -- override OS default (ubuntu)
-  service:
+  systemd:
     name: apparmor
     enabled: False
     state: stopped
@@ -141,6 +140,3 @@
   template:
     src: roles/1-prep/templates/iiab.env.j2
     dest: "{{ iiab_env_file }}"
-    owner: root
-    group: root
-    mode: 0644