From a4e5168c8779f306c64613692d21f4631e90f6d0 Mon Sep 17 00:00:00 2001 From: Michael Pellegrino Date: Mon, 9 May 2022 13:45:19 -0400 Subject: [PATCH] *more fixes to prompt for username/password *fix youtube script so vtomb.com auto-plays (add --autoplay-polic=no-user-gesture-required to command) --- group_vars/all.yml | 1 - main.yaml | 165 ++++++++++++++++----------- roles/common/tasks/main.yaml | 3 +- roles/facebook/files/facebook.sh | 4 +- roles/facebook/tasks/main.yaml | 2 +- roles/salesforce/files/salesforce.sh | 4 +- roles/salesforce/tasks/main.yaml | 2 +- roles/youtube/files/youtube.sh | 2 +- 8 files changed, 110 insertions(+), 73 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 915f220..bf7d9af 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,5 +1,4 @@ --- -def_username: 'mikepell' def_ad_workgroup : 'LAB' def_ad_realm : 'LAB.LOCAL' def_ad_admin : 'administrator' diff --git a/main.yaml b/main.yaml index a2c7847..276d5a9 100644 --- a/main.yaml +++ b/main.yaml @@ -1,64 +1,101 @@ ---- -- hosts: update - roles: - - update -- hosts: netflows - roles: - - netflows -- hosts: all - roles: - - common - - fail2ban -- hosts: public - roles: - - public -- hosts: samba-server - roles: - - samba-server -- hosts: smbclient - roles: - - smbclient -- hosts: pi - roles: - - vnc - - domainname - - pi - # vars_prompt: - # - name: rocommunity - # prompt: "Enter SNMP RO community name" - # default: "public" -- hosts: youtube - roles: - - youtube -- hosts: ftpclient - roles: - - ftpclient -- hosts: facebook - roles: - - facebook -- hosts: salesforce - roles: - - salesforce -- hosts: all - roles: - - nrpe -- hosts: sipclient - roles: - - sipp - - sipclient -- hosts: sipserver - roles: - - sipp - - sipserver -- hosts: ntopng - roles: - - ntopng -- hosts: ap - roles: - - ap -- hosts: snmpd - roles: - - snmpd -- hosts: tcgui - roles: - - tcgui +--- +- hosts: all + vars_prompt: + - name: def_user + prompt: Enter username to use (ie. pi) + private: no + - name: def_pass + prompt: Enter password to use + private: yes + encrypt: sha512_crypt + confirm: yes + unsafe: yes + salt_size: 7 + + tasks: + - set_fact: def_username={{ def_user }} + no_log: true + - set_fact: def_password={{ def_pass }} + no_log: + + - name: make direcotry + file: + path: "/home/{{ def_username }}/.ssh" + owner: "{{ def_username }}" + group: "{{ def_username }}" + mode: '0700' + state: directory + - name: create empty file + file: + path: "/home/{{ def_username }}/.ssh/authorized_keys" + owner: "{{ def_username }}" + group: "{{ def_username }}" + mode: '0644' + state: touch + - name: put pubkey + lineinfile: + path: "/home/{{ def_username }}/.ssh/authorized_keys" + line: "{{ pubkey }}" +- hosts: update + roles: + - update +- hosts: netflows + roles: + - netflows +- hosts: all + roles: + - common + - fail2ban +- hosts: public + roles: + - public +- hosts: samba-server + roles: + - samba-server +- hosts: smbclient + roles: + - smbclient +- hosts: pi + roles: + - vnc + - domainname + - pi + # vars_prompt: + # - name: rocommunity + # prompt: "Enter SNMP RO community name" + # default: "public" +- hosts: youtube + roles: + - youtube +- hosts: ftpclient + roles: + - ftpclient +- hosts: facebook + roles: + - facebook +- hosts: salesforce + roles: + - salesforce +- hosts: all + roles: + - nrpe +- hosts: sipclient + roles: + - sipp + - sipclient +- hosts: sipserver + roles: + - sipp + - sipserver +- hosts: ntopng + roles: + - ntopng +- hosts: ap + roles: + - ap +- hosts: snmpd + roles: + - snmpd +- hosts: tcgui + roles: + - tcgui diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml index b599b0e..9ed34f5 100644 --- a/roles/common/tasks/main.yaml +++ b/roles/common/tasks/main.yaml @@ -101,7 +101,8 @@ update_password: always # 'piadmin99' #password: "$6$Vmob4l5KBg11gcNV$fY.hrffHEc9gpcFhVdEmW7tepxJURBmkgQhC7kC25VsxcfHAtlqEP6Cvm6nK4jtqndkaQ/I29h/MkKk8KsdSV1" - password: "$6$rmO12Z8HeUt6wQ$6JM550bdYBEQ22HWw2Ax1hKxawTDG5odoIFj6.RtHDUVs4jUVnqA.StSBr0HJiSw4Xnn2VBrLBxuZ7MLY820O0" + #password: "$6$rmO12Z8HeUt6wQ$6JM550bdYBEQ22HWw2Ax1hKxawTDG5odoIFj6.RtHDUVs4jUVnqA.StSBr0HJiSw4Xnn2VBrLBxuZ7MLY820O0" + password: '{{ def_password }}' tags: pi password - name: remove xscreensaver diff --git a/roles/facebook/files/facebook.sh b/roles/facebook/files/facebook.sh index bf197d8..af41af3 100644 --- a/roles/facebook/files/facebook.sh +++ b/roles/facebook/files/facebook.sh @@ -3,7 +3,7 @@ #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/chromium-browser `shuf -n 1 /home/{{ def_username }}/Documents/facebook_url.list` & } #prevent race condition/memory exhaustion @@ -17,6 +17,6 @@ else sleep 10 done /usr/bin/killall chrome - rm /home/'{{ def_username }}'/.config/chromium/BrowserMetrics/* + rm /home/{{ def_username }}/.config/chromium/BrowserMetrics/* fi diff --git a/roles/facebook/tasks/main.yaml b/roles/facebook/tasks/main.yaml index 43534a0..4bfb5cd 100644 --- a/roles/facebook/tasks/main.yaml +++ b/roles/facebook/tasks/main.yaml @@ -1,6 +1,6 @@ --- - name: copy facebook script - copy: + template: src: "{{ item.src }}" dest: "{{ item.dest }}" owner: "{{ def_username }}" diff --git a/roles/salesforce/files/salesforce.sh b/roles/salesforce/files/salesforce.sh index 83be16a..a1f94cd 100644 --- a/roles/salesforce/files/salesforce.sh +++ b/roles/salesforce/files/salesforce.sh @@ -3,7 +3,7 @@ #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/chromium-browser `shuf -n 1 /home/{{ def_username }}/Documents/salesforce_url.list` & } if pgrep -f chrome >/dev/null @@ -16,6 +16,6 @@ else sleep 25 done /usr/bin/killall chrome - rm /home/'{{ def_username }}'/.config/chromium/BrowserMetrics/* + rm /home/{{ def_username }}/.config/chromium/BrowserMetrics/* fi diff --git a/roles/salesforce/tasks/main.yaml b/roles/salesforce/tasks/main.yaml index 70fdf37..92b3a1c 100644 --- a/roles/salesforce/tasks/main.yaml +++ b/roles/salesforce/tasks/main.yaml @@ -1,6 +1,6 @@ --- - name: copy salesforce script - copy: + template: src: "{{ item.src }}" dest: "{{ item.dest }}" owner: "{{ def_username }}" diff --git a/roles/youtube/files/youtube.sh b/roles/youtube/files/youtube.sh index bd66dba..229d6ea 100644 --- a/roles/youtube/files/youtube.sh +++ b/roles/youtube/files/youtube.sh @@ -4,7 +4,7 @@ if pgrep -f chromium-browser >/dev/null then exit 0 else - DISPLAY=:0 /usr/bin/chromium-browser https://www.vtomb.com & + DISPLAY=:0 /usr/bin/chromium-browser --autoplay-policy=no-user-gesture-required https://www.vtomb.com & /usr/bin/perl -e 'sleep int rand 300' && /usr/bin/killall /usr/lib/chromium-browser/chromium-browser-v7 fi