*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,5 +1,4 @@
 ---
-def_username: 'mikepell'
 def_ad_workgroup : 'LAB'
 def_ad_realm : 'LAB.LOCAL'
 def_ad_admin : 'administrator'

main.yaml

@@ -1,64 +1,101 @@
----
+---
-- hosts: update
+- hosts: all
-  roles:
+  vars_prompt:
-          - update
+    - name: def_user
-- hosts: netflows
+      prompt: Enter username to use (ie. pi)
-  roles:
+      private: no
-          - netflows
+    - name: def_pass
-- hosts: all
+      prompt: Enter password to use
-  roles:
+      private: yes
-          - common
+      encrypt: sha512_crypt
-          - fail2ban
+      confirm: yes
-- hosts: public
+      unsafe: yes
-  roles:
+      salt_size: 7
-          - public
+
-- hosts: samba-server
+  tasks:
-  roles:
+  - set_fact: def_username={{ def_user }}
-          - samba-server
+    no_log: true
-- hosts: smbclient
+  - set_fact: def_password={{ def_pass }}
-  roles:
+    no_log:
-          - smbclient
+
-- hosts: pi
+  - name: make direcotry
-  roles:
+    file:
-          - vnc
+      path: "/home/{{ def_username }}/.ssh"
-          - domainname
+      owner: "{{ def_username }}"
-          - pi
+      group: "{{ def_username }}"
-            #  vars_prompt:
+      mode: '0700'
-            #    - name: rocommunity
+      state: directory
-            #      prompt: "Enter SNMP RO community name"
+  - name: create empty file
-            #      default: "public"
+    file:
-- hosts: youtube
+      path: "/home/{{ def_username }}/.ssh/authorized_keys"
-  roles:
+      owner: "{{ def_username }}"
-          - youtube
+      group: "{{ def_username }}"
-- hosts: ftpclient
+      mode: '0644'
-  roles:
+      state: touch
-          - ftpclient
+  - name: put pubkey
-- hosts: facebook
+    lineinfile:
-  roles:
+      path: "/home/{{ def_username }}/.ssh/authorized_keys"
-          - facebook
+      line: "{{ pubkey }}"
-- hosts: salesforce
+- hosts: update
-  roles:
+  roles:
-          - salesforce
+          - update
-- hosts: all
+- hosts: netflows
-  roles:
+  roles:
-          - nrpe
+          - netflows
-- hosts: sipclient
+- hosts: all
-  roles:
+  roles:
-          - sipp
+          - common
-          - sipclient
+          - fail2ban
-- hosts: sipserver
+- hosts: public
-  roles:
+  roles:
-          - sipp
+          - public
-          - sipserver
+- hosts: samba-server
-- hosts: ntopng
+  roles:
-  roles:
+          - samba-server
-          - ntopng
+- hosts: smbclient
-- hosts: ap
+  roles:
-  roles:
+          - smbclient
-          - ap
+- hosts: pi
-- hosts: snmpd
+  roles:
-  roles:
+          - vnc
-          - snmpd
+          - domainname
-- hosts: tcgui
+          - pi
-  roles:
+            #  vars_prompt:
-          - tcgui
+            #    - 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

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

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
 

roles/facebook/tasks/main.yaml

@@ -1,6 +1,6 @@
 ---
 - name: copy facebook script
-  copy:
+  template:
           src: "{{ item.src }}"
           dest: "{{ item.dest }}"
           owner: "{{ def_username }}"

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
 

roles/salesforce/tasks/main.yaml

@@ -1,6 +1,6 @@
 ---
 - name: copy salesforce script
-  copy:
+  template:
           src: "{{ item.src }}"
           dest: "{{ item.dest }}"
           owner: "{{ def_username }}"

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