From ddc5c881def8f290a7b1f4b800834cbf2fb5bfc6 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sun, 8 Nov 2020 00:05:48 -0600
Subject: [PATCH] Unify some homebrew roles' become methods

---
 roles/ansible-pull/tasks/main.yml | 31 ++++++++++++++-----------------
 roles/common/tasks/ansible.yml    | 19 ++++++++-----------
 roles/common/tasks/packages.yml   |  1 -
 roles/common/tasks/system.yml     | 13 +++++--------
 site.yml                          |  2 ++
 5 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/roles/ansible-pull/tasks/main.yml b/roles/ansible-pull/tasks/main.yml
index e2c1ea5..f125b70 100644
--- a/roles/ansible-pull/tasks/main.yml
+++ b/roles/ansible-pull/tasks/main.yml
@@ -1,20 +1,17 @@
 #!/usr/bin/env ansible-playbook
 # vim:ft=ansible:
-- name: configure ansible-pull
-  block:
-    - name: assure vault password file
-      copy: src=vaultpass dest="~/ansiblevaultpass" mode="0600"
-      become: yes
-      become_user: ansible
-    - name: install ansible
-      pip: name=ansible,ansible-base,ansible-lint state=latest
-    - name: configure systemd service
-      template: src=ansible-pull.service dest=/etc/systemd/system/ansible-pull.service
-      notify: restart ansiblepull timer
-    - name: configure systemd timer
-      template: src=ansible-pull.timer dest=/etc/systemd/system/ansible-pull.timer
-      notify: restart ansiblepull timer
-    - name: enable timer
-      systemd: daemon_reload=yes name=ansible-pull.timer enabled=yes state=started
-      notify: restart ansiblepull timer
+- name: assure vault password file
+  copy: src=vaultpass dest="~/ansiblevaultpass" mode="0600"
   become: yes
+  become_user: ansible
+- name: install ansible
+  pip: name=ansible,ansible-base,ansible-lint state=latest
+- name: configure systemd service
+  template: src=ansible-pull.service dest=/etc/systemd/system/ansible-pull.service
+  notify: restart ansiblepull timer
+- name: configure systemd timer
+  template: src=ansible-pull.timer dest=/etc/systemd/system/ansible-pull.timer
+  notify: restart ansiblepull timer
+- name: enable timer
+  systemd: daemon_reload=yes name=ansible-pull.timer enabled=yes state=started
+  notify: restart ansiblepull timer
diff --git a/roles/common/tasks/ansible.yml b/roles/common/tasks/ansible.yml
index 72e857e..1ed2043 100644
--- a/roles/common/tasks/ansible.yml
+++ b/roles/common/tasks/ansible.yml
@@ -1,13 +1,10 @@
 #!/usr/bin/env ansible-playbook
 # vim:ft=ansible:
-- name: configure ansible user
-  block:
-    - name: create ansible user
-      user: name=ansible password_lock=yes
-    - name: configure ansible user home directory
-      file: path=/home/ansible owner=ansible group=ansible
-    - name: configure ansible user keys
-      authorized_key: user=ansible manage_dir=yes key={{ common_ansible_pubkey }}
-    - name: configure ansible user sudo
-      lineinfile: path=/etc/sudoers line="ansible ALL=(ALL:ALL) NOPASSWD:ALL"
-  become: yes
+- name: create ansible user
+  user: name=ansible password_lock=yes
+- name: configure ansible user home directory
+  file: path=/home/ansible owner=ansible group=ansible
+- name: configure ansible user keys
+  authorized_key: user=ansible manage_dir=yes key={{ common_ansible_pubkey }}
+- name: configure ansible user sudo
+  lineinfile: path=/etc/sudoers line="ansible ALL=(ALL:ALL) NOPASSWD:ALL"
diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml
index c63e952..ef8e57a 100644
--- a/roles/common/tasks/packages.yml
+++ b/roles/common/tasks/packages.yml
@@ -28,5 +28,4 @@
           - whois
     - name: remove basic packages
       apt: state=absent name=unattended-upgrades
-  become: yes
   when: ansible_os_family == "Debian"
diff --git a/roles/common/tasks/system.yml b/roles/common/tasks/system.yml
index 1b35bc7..d8aefa6 100644
--- a/roles/common/tasks/system.yml
+++ b/roles/common/tasks/system.yml
@@ -1,10 +1,7 @@
 #!/usr/bin/env ansible-playbook
 # vim:ft=ansible:
-- name: configure system
-  block:
-    - name: configure hostname
-      hostname: name={{ inventory_hostname }}
-    - name: configure timezone
-      timezone: name=America/Chicago
-      notify: restart cron
-  become: yes
+- name: configure hostname
+  hostname: name={{ inventory_hostname }}
+- name: configure timezone
+  timezone: name=America/Chicago
+  notify: restart cron
diff --git a/site.yml b/site.yml
index 29ec5cd..8caa14c 100755
--- a/site.yml
+++ b/site.yml
@@ -5,8 +5,10 @@
 - hosts: all
   roles:
     - role: common
+      become: yes
       tags: [ common ]
     - role: ansible-pull
+      become: yes
       tags: [ ansible, common ]
   # Home desktops
 - hosts: desktop