From 97d94fe3f284fc85dee61bafa4580cbfdf9ab7c5 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Mon, 10 Jun 2019 15:07:18 -0400
Subject: [PATCH] Fix up some weird issues

---
 roles/base/tasks/main.yml                     | 26 ++++++++++++++-----
 .../templates/etc/apt/sources.list.x86_64.j2  |  4 +--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index a8ee312..17bef08 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -30,7 +30,7 @@
 
 - name: regather local facts
   setup:
-    gather_subset: "!all,!any,local"
+    gather_subset: "local"
   when: installed_facts.changed
 
 - debug:
@@ -84,6 +84,13 @@
     - { src: "etc/apt/sources.list.{{ ansible_machine }}.j2", dest: "/etc/apt/sources.list" }
   tags: apt
 
+- name: add key for bonilan repo
+  apt_key:
+    url: "https://repo.bonifacelabs.net/debian/bonifacelabs_signing_key.pub"
+    id: "83D07192314835D4"
+    state: present
+  tags: apt
+
 #
 # Safe apt upgrades (on first install only)
 #
@@ -170,6 +177,9 @@
       - less
       - vim
       - git
+      - vlan
+      - bridge-utils
+      - ifenslave
       - nmap
       - netcat-openbsd
       - htop
@@ -586,8 +596,10 @@
 - name: add authorized keys
   authorized_key:
     user: "deploy"
-    key: "{{ item.key }}"
-  with_items: "{{ admin_users }}"
+    key: "{{ item.1 }}"
+  with_subelements:
+    - "{{ admin_users }}"
+    - keys
   tags: users
 
 # admin_users
@@ -627,9 +639,11 @@
 
 - name: add authorized keys
   authorized_key:
-    user: "{{ item.name }}"
-    key: "{{ item.key }}"
-  with_items: "{{ admin_users }}"
+    user: "{{ item.0.name }}"
+    key: "{{ item.1 }}"
+  with_subelements:
+    - "{{ admin_users }}"
+    - keys
   tags: users
 
 - name: write bashrc to homedir
diff --git a/roles/base/templates/etc/apt/sources.list.x86_64.j2 b/roles/base/templates/etc/apt/sources.list.x86_64.j2
index fbb5ec5..ce6814e 100644
--- a/roles/base/templates/etc/apt/sources.list.x86_64.j2
+++ b/roles/base/templates/etc/apt/sources.list.x86_64.j2
@@ -10,5 +10,5 @@ deb-src http://security.debian.org/ {{ ansible_distribution_release }}/updates m
 deb http://debian.mirror.rafal.ca/debian/ {{ ansible_distribution_release }}-updates main contrib
 deb-src http://debian.mirror.rafal.ca/debian/ {{ ansible_distribution_release }}-updates main contrib
 
-deb https://repo.bonifacelabs.net/debian/ {{ ansible_distribution_release }}-updates main
-deb-src https://repo.bonifacelabs.net/debian/ {{ ansible_distribution_release }}-updates main
+deb https://repo.bonifacelabs.net/debian/ {{ ansible_distribution_release }} main
+deb-src https://repo.bonifacelabs.net/debian/ {{ ansible_distribution_release }} main