From 420d2587daa66d92b08aeecb473ab05bc3c16b53 Mon Sep 17 00:00:00 2001
From: Pig Monkey <pm@pig-monkey.com>
Date: Sat, 17 Nov 2018 22:25:40 -0800
Subject: [PATCH] replace nmtrust submodule with aur package

Existing users should first remove the old submodule files, and move the
nmtrust config files to their new location:

 # rm /usr/local/bin/nmtrust
 # rm /usr/local/bin/ttoggle
 # rm /etc/NetworkManager/dispatcher.d/10trust
 # mkdir /etc/nmtrust
 # mv /usr/local/etc/trusted_* /etc/nmtrust/
---
 .gitmodules                         |  3 ---
 roles/networkmanager/files/nmtrust  |  1 -
 roles/networkmanager/tasks/main.yml | 37 +++++++++++++++++------------
 3 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 160000 roles/networkmanager/files/nmtrust

diff --git a/.gitmodules b/.gitmodules
index 9156b91..97009b1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "library/ansible-aur"]
 	path = library/ansible-aur
 	url = https://github.com/pigmonkey/ansible-aur.git
-[submodule "roles/networkmanager/files/nmtrust"]
-	path = roles/networkmanager/files/nmtrust
-	url = https://github.com/pigmonkey/nmtrust.git
 [submodule "roles/backitup/files/backitup"]
 	path = roles/backitup/files/backitup
 	url = https://github.com/pigmonkey/backitup
diff --git a/roles/networkmanager/files/nmtrust b/roles/networkmanager/files/nmtrust
deleted file mode 160000
index 1dc724e..0000000
--- a/roles/networkmanager/files/nmtrust
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1dc724e54c2a8c086b724e17d9910f48df8f7df8
diff --git a/roles/networkmanager/tasks/main.yml b/roles/networkmanager/tasks/main.yml
index d6f60d5..fc3dec8 100644
--- a/roles/networkmanager/tasks/main.yml
+++ b/roles/networkmanager/tasks/main.yml
@@ -8,21 +8,6 @@
       - xfce4-notifyd
       - gnome-keyring
 
-- name: Push trusted network list
-  template: src=trusted_networks.j2 dest=/usr/local/etc/trusted_networks
-
-- name: Verify trusted unit list exists
-  file: path=/usr/local/etc/trusted_units state=touch
-
-- name: Push trusted network checker
-  copy: src=nmtrust/nmtrust dest=/usr/local/bin/nmtrust mode=0755
-
-- name: Push trusted unit toggler
-  copy: src=nmtrust/ttoggle dest=/usr/local/bin/ttoggle mode=0755
-
-- name: Push trusted network dispatcher
-  copy: src=nmtrust/dispatcher/10trust dest=/etc/NetworkManager/dispatcher.d/10trust mode=0755
-
 - name: Push connectivity check config
   template: src=connectivity.conf.j2 dest=/etc/NetworkManager/conf.d/20-connectivity.conf
   when: network.conn_check is defined
@@ -32,3 +17,25 @@
 
 - name: Enable and start NetworkManager dispatcher
   service: name=NetworkManager-dispatcher.service enabled=yes state=started
+
+- name: Install nmtrust
+  aur:
+      name: nmtrust-git
+      user: "{{ user.name }}"
+  tags:
+    - aur
+
+- name: Create nmtrust config directory
+  file:
+      path: /etc/nmtrust
+      state: directory
+
+- name: Push trusted network list
+  template:
+      src: trusted_networks.j2
+      dest: /etc/nmtrust/trusted_networks
+
+- name: Verify trusted unit list exists
+  file:
+      path: /etc/trusted_units
+      state: touch