From bc8d833a1721749e471f64b12ff4d2c1838773ee Mon Sep 17 00:00:00 2001 From: Pig Monkey Date: Sun, 31 Jan 2016 17:35:40 -0800 Subject: [PATCH] merge firewarden and disposable Existing users should remove /usr/local/bin/disposable --- .gitmodules | 3 --- group_vars/all | 2 +- roles/firejail/files/disposable | 1 - roles/firejail/files/firewarden | 2 +- roles/firejail/tasks/main.yml | 5 +---- 5 files changed, 3 insertions(+), 10 deletions(-) delete mode 160000 roles/firejail/files/disposable diff --git a/.gitmodules b/.gitmodules index a201e91..ab590a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "roles/firejail/files/firewarden"] path = roles/firejail/files/firewarden url = https://github.com/pigmonkey/firewarden.git -[submodule "roles/firejail/files/disposable"] - path = roles/firejail/files/disposable - url = https://github.com/pigmonkey/disposable.git [submodule "roles/networkmanager/files/nmtrust"] path = roles/networkmanager/files/nmtrust url = https://github.com/pigmonkey/nmtrust.git diff --git a/group_vars/all b/group_vars/all index a7237ff..483d7b2 100644 --- a/group_vars/all +++ b/group_vars/all @@ -72,7 +72,7 @@ filesystem_packages: browser_choices: - firefox -P default - firefox -P work - - disposable chromium + - firewarden chromium passwordless_sudo: - /usr/bin/openvpn* diff --git a/roles/firejail/files/disposable b/roles/firejail/files/disposable deleted file mode 160000 index e6f32e3..0000000 --- a/roles/firejail/files/disposable +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e6f32e3a40bd23014e448cee5421e981db708035 diff --git a/roles/firejail/files/firewarden b/roles/firejail/files/firewarden index 44ad3b8..dc57ba3 160000 --- a/roles/firejail/files/firewarden +++ b/roles/firejail/files/firewarden @@ -1 +1 @@ -Subproject commit 44ad3b81a4ef648866cd493d3219d999a4c78d02 +Subproject commit dc57ba3d04d34a6c81e60e990a12ce4699646294 diff --git a/roles/firejail/tasks/main.yml b/roles/firejail/tasks/main.yml index 8463c4c..d1db829 100644 --- a/roles/firejail/tasks/main.yml +++ b/roles/firejail/tasks/main.yml @@ -5,7 +5,4 @@ - aur - name: Install firewarden.sh script - copy: src=firewarden/firewarden.sh dest=/usr/local/bin/firewarden mode=0755 - -- name: Install disposable.sh script - copy: src=disposable/disposable.sh dest=/usr/local/bin/disposable mode=0755 + copy: src=firewarden/firewarden dest=/usr/local/bin/firewarden mode=0755