From a4c2475369f7bb13183e054a54c464815c0b60f4 Mon Sep 17 00:00:00 2001 From: Pig Monkey Date: Fri, 2 Jun 2017 19:22:15 -0700 Subject: [PATCH] replace firewarden submodule with package Existing users should remove the script from the old location # rm /usr/local/bin/firewarden --- .gitmodules | 3 --- roles/firejail/files/firewarden | 1 - roles/firejail/tasks/main.yml | 8 +++++--- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 160000 roles/firejail/files/firewarden diff --git a/.gitmodules b/.gitmodules index 130a1c3..900b03c 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/firejail/files/firewarden"] - path = roles/firejail/files/firewarden - url = https://github.com/pigmonkey/firewarden.git [submodule "roles/networkmanager/files/nmtrust"] path = roles/networkmanager/files/nmtrust url = https://github.com/pigmonkey/nmtrust.git diff --git a/roles/firejail/files/firewarden b/roles/firejail/files/firewarden deleted file mode 160000 index c2940e4..0000000 --- a/roles/firejail/files/firewarden +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c2940e4e0fa5dd9c2fb90aad9957ddf28efd4b0e diff --git a/roles/firejail/tasks/main.yml b/roles/firejail/tasks/main.yml index 3d54dee..49f8abd 100644 --- a/roles/firejail/tasks/main.yml +++ b/roles/firejail/tasks/main.yml @@ -2,12 +2,14 @@ - name: Install firejail pacman: name=firejail state=present +- name: Install firewarden + aur: name=firewarden user={{ user.name }} + tags: + - aur + - name: Install firejail profile update script copy: src=profile-activate.sh dest=/usr/local/bin/profile-activate mode=0755 -- name: Install firewarden.sh script - copy: src=firewarden/firewarden dest=/usr/local/bin/firewarden mode=0755 - - name: Create firejail profile directory file: path=/usr/local/etc/firejail state=directory