From 85e7e96c083e409de742631ef63f16eec216d9e6 Mon Sep 17 00:00:00 2001 From: Michael Pellegrino Date: Fri, 1 Jul 2022 13:30:21 -0400 Subject: [PATCH] -added firefox role -attempt again to disable screensaver --- main.yaml | 5 +++- roles/common/files/lxqt-powermanagement.conf | 15 ++++++++++ roles/common/files/proc_check.sh | 2 ++ roles/common/tasks/main.yaml | 30 ++++++++++---------- roles/facebook/files/facebook.sh | 6 +++- roles/firefox/files/user.js | 1 + roles/firefox/tasks/main.yaml | 18 ++++++++++++ roles/salesforce/files/salesforce.sh | 6 +++- roles/youtube/files/youtube.sh | 5 +++- 9 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 roles/common/files/lxqt-powermanagement.conf create mode 100644 roles/firefox/files/user.js create mode 100644 roles/firefox/tasks/main.yaml diff --git a/main.yaml b/main.yaml index a9297d5..24d8e3b 100644 --- a/main.yaml +++ b/main.yaml @@ -24,7 +24,6 @@ state: present key: "{{ lookup('file', '~/.ssh/id_rsa.pub') }}" - - hosts: update roles: - update @@ -88,3 +87,7 @@ - hosts: tcgui roles: - tcgui + +- hosts: firefox + roles: + - firefox diff --git a/roles/common/files/lxqt-powermanagement.conf b/roles/common/files/lxqt-powermanagement.conf new file mode 100644 index 0000000..49bc222 --- /dev/null +++ b/roles/common/files/lxqt-powermanagement.conf @@ -0,0 +1,15 @@ +[General] +__userfile__=true +backlightIdleness=0 +backlightIdlenessOnBatteryDischarging=true +disableIdlenessWhenFullscreen=false +enableBatteryWatcher=false +enableIdlenessBacklightWatcher=false +enableIdlenessWatcher=false +enableLidWatcher=false +idlenessACAction=-1 +idlenessACTime=@Variant(\0\0\0\xf\0\r\xbb\xa0) +idlenessBatteryAction=-1 +idlenessBatteryTime=@Variant(\0\0\0\xf\0\r\xbb\xa0) +idlenessTime=@Variant(\0\0\0\xf\0\0\x3\xe8) +runCheckLevel=1 diff --git a/roles/common/files/proc_check.sh b/roles/common/files/proc_check.sh index 55a13c3..d780b3c 100644 --- a/roles/common/files/proc_check.sh +++ b/roles/common/files/proc_check.sh @@ -2,5 +2,7 @@ sudo /usr/bin/killall chromium-browser sudo /usr/bin/killall chromium-browser sudo /usr/bin/killall chromium-browser +sudo /usr/bin/killall firefox +sudo /usr/bin/killall firefox sudo systemctl restart ntopng diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml index 64a0c90..bafb538 100644 --- a/roles/common/tasks/main.yaml +++ b/roles/common/tasks/main.yaml @@ -20,15 +20,6 @@ content: "{{ lookup('template', '{{ role_path }}/templates/hosts.j2') }}" state: present tags: update_hosts -- name: update package cache - become: true - ansible.builtin.apt: - update_cache: yes -- name: hold connman - using netplan - become: true - dpkg_selections: - name: connman - selection: hold - name: install required packages become: true @@ -92,9 +83,18 @@ password: '{{ def_password }}' tags: pi password -- name: remove xscreensaver - become: yes - apt: - name: xscreensaver - state: absent - autoremove: yes + #- name: remove xscreensaver + # become: yes + # apt: + # name: xscreensaver + # state: absent + # autoremove: yes +- name: screensaver + ansible.builtin.copy: + src: "{{ role_path }}/files/lxqt-powermanagement.conf" + dest: "/home/{{ def_username }}/.config/lxqt" + owner: "{{ def_username }}" + group: "{{ def_username }}" + tags: powermanagement + + diff --git a/roles/facebook/files/facebook.sh b/roles/facebook/files/facebook.sh index af41af3..3b85677 100644 --- a/roles/facebook/files/facebook.sh +++ b/roles/facebook/files/facebook.sh @@ -4,19 +4,23 @@ #launch browser on local display function launch_browser { DISPLAY=:0 /usr/bin/chromium-browser `shuf -n 1 /home/{{ def_username }}/Documents/facebook_url.list` & + #DISPLAY=:0 /usr/bin/firefox `shuf -n 1 /home/{{ def_username }}/Documents/facebook_url.list` & } #prevent race condition/memory exhaustion if pgrep -f chrome >/dev/null +#if pgrep -f firefox >/dev/null then /usr/bin/killall chrome + #/usr/bin/killall firefox else for i in $(seq 13) do launch_browser sleep 10 done - /usr/bin/killall chrome + /usr/bin/killall chrom + #/usr/bin/killall firefox rm /home/{{ def_username }}/.config/chromium/BrowserMetrics/* fi diff --git a/roles/firefox/files/user.js b/roles/firefox/files/user.js new file mode 100644 index 0000000..48d4571 --- /dev/null +++ b/roles/firefox/files/user.js @@ -0,0 +1 @@ +user_pref("media.autoplay.default", 0); diff --git a/roles/firefox/tasks/main.yaml b/roles/firefox/tasks/main.yaml new file mode 100644 index 0000000..40f316e --- /dev/null +++ b/roles/firefox/tasks/main.yaml @@ -0,0 +1,18 @@ +--- +- name: install firefox + become: true + package: + name: firefox + state: present +- name: initialze firefox profile + command: /usr/bin/firefox --headless -CreateProfile "vtomb /home/{{ def_username }}/snap/firefox/common/.mozilla/firefox/vtomb" + + +- name: copy firefox user prefs + copy: + src: "{{ role_path }}/files/user.js" + dest: "/home/{{ def_username }}/snap/firefox/common/.mozilla/firefox/vtomb" + owner: "{{ def_username }}" + group: "{{ def_username }}" + + diff --git a/roles/salesforce/files/salesforce.sh b/roles/salesforce/files/salesforce.sh index a1f94cd..6905e16 100644 --- a/roles/salesforce/files/salesforce.sh +++ b/roles/salesforce/files/salesforce.sh @@ -4,11 +4,14 @@ #launch browser on local display function launch_browser { DISPLAY=:0 /usr/bin/chromium-browser `shuf -n 1 /home/{{ def_username }}/Documents/salesforce_url.list` & + #DISPLAY=:0 /usr/bin/firefox `shuf -n 1 /home/{{ def_username }}/Documents/salesforce_url.list` & } -if pgrep -f chrome >/dev/null +#if pgrep -f chrome >/dev/null +if pgrep -f firefox >/dev/null then /usr/bin/killall chrome + #/usr/bin/killall firefox else for i in $(seq 9) do @@ -16,6 +19,7 @@ else sleep 25 done /usr/bin/killall chrome + #/usr/bin/killall firefox rm /home/{{ def_username }}/.config/chromium/BrowserMetrics/* fi diff --git a/roles/youtube/files/youtube.sh b/roles/youtube/files/youtube.sh index 229d6ea..6a79102 100644 --- a/roles/youtube/files/youtube.sh +++ b/roles/youtube/files/youtube.sh @@ -1,10 +1,13 @@ #!/bin/bash # play random youtube videos for up to 15 minutes -if pgrep -f chromium-browser >/dev/null +#if pgrep -f chromium-browser >/dev/null +if pgrep -f firefox >/dev/null then exit 0 else DISPLAY=:0 /usr/bin/chromium-browser --autoplay-policy=no-user-gesture-required https://www.vtomb.com & + #DISPLAY=:0 /usr/bin/firefox https://www.vtomb.com & /usr/bin/perl -e 'sleep int rand 300' && /usr/bin/killall /usr/lib/chromium-browser/chromium-browser-v7 + #/usr/bin/perl -e 'sleep int rand 300' && /usr/bin/killall firefox fi