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/
This commit is contained in:
Pig Monkey 2018-11-17 22:25:40 -08:00
parent c4be5e5e7b
commit 420d2587da
3 changed files with 22 additions and 19 deletions

3
.gitmodules vendored
View file

@ -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

@ -1 +0,0 @@
Subproject commit 1dc724e54c2a8c086b724e17d9910f48df8f7df8

View file

@ -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