From 9d8c451dea7c2ff0147bda732a80692b7402d197 Mon Sep 17 00:00:00 2001 From: mpelle426 Date: Fri, 12 Jul 2019 16:23:36 +0100 Subject: [PATCH] -remove wpasupplicant by default --- hosts | 2 ++ roles/facebook/files/facebook.sh | 2 +- roles/pi/tasks/main.yaml | 7 +++++++ roles/salesforce/files/salesforce.sh | 2 +- roles/wifi/tasks/main.yaml | 7 ------- roles/youtube/files/youtube.sh | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hosts b/hosts index d51d431..44d04b9 100644 --- a/hosts +++ b/hosts @@ -16,6 +16,8 @@ ned-host1 ned-host2 ned-host3 +# use variables for passwords +# currently not implemented [pi:vars] vncpassword=vncpass99 pipassword=pipassword99 diff --git a/roles/facebook/files/facebook.sh b/roles/facebook/files/facebook.sh index ccb48f1..46c2b78 100644 --- a/roles/facebook/files/facebook.sh +++ b/roles/facebook/files/facebook.sh @@ -16,6 +16,6 @@ else launch_browser sleep 10 done - sleep 30 && /usr/bin/killall chromium-browser && /usr/bin/killall chromium-browser-v7 + sleep 30 && /usr/bin/killall chromium-browser && /usr/bin/killall /usr/lib/chromium-browser/chromium-browser-v7 fi diff --git a/roles/pi/tasks/main.yaml b/roles/pi/tasks/main.yaml index d360e05..edb08f1 100644 --- a/roles/pi/tasks/main.yaml +++ b/roles/pi/tasks/main.yaml @@ -1,4 +1,11 @@ --- +- name: Remove wpasupplicant package + become: yes + apt: + name: ['wpasupplicant'] + state: absent + purge: true + tags: wireless_ap - name: set swapfile become: true lineinfile: diff --git a/roles/salesforce/files/salesforce.sh b/roles/salesforce/files/salesforce.sh index c104b0a..85f38b3 100644 --- a/roles/salesforce/files/salesforce.sh +++ b/roles/salesforce/files/salesforce.sh @@ -15,6 +15,6 @@ else launch_browser sleep 25 done - sleep 30 && /usr/bin/killall chromium-browser && /usr/bin/killall chromium-browser-v7 + sleep 30 && /usr/bin/killall chromium-browser && /usr/bin/killall /usr/lib/chromium-browser/chromium-browser-v7 fi diff --git a/roles/wifi/tasks/main.yaml b/roles/wifi/tasks/main.yaml index 521cf95..f016138 100644 --- a/roles/wifi/tasks/main.yaml +++ b/roles/wifi/tasks/main.yaml @@ -1,11 +1,4 @@ --- -- name: Remove wpasupplicant package - become: yes - apt: - name: ['wpasupplicant'] - state: absent - purge: true - tags: wireless_ap - name: configure wlan0 become: true blockinfile: diff --git a/roles/youtube/files/youtube.sh b/roles/youtube/files/youtube.sh index 6defb83..bd66dba 100644 --- a/roles/youtube/files/youtube.sh +++ b/roles/youtube/files/youtube.sh @@ -5,6 +5,6 @@ then exit 0 else DISPLAY=:0 /usr/bin/chromium-browser https://www.vtomb.com & - /usr/bin/perl -e 'sleep int rand 300' && /usr/bin/killall chromium-browser + /usr/bin/perl -e 'sleep int rand 300' && /usr/bin/killall /usr/lib/chromium-browser/chromium-browser-v7 fi