From d539e4094326c5d67cd915fe9758ae378f947afa Mon Sep 17 00:00:00 2001 From: Michael Pellegrino Date: Sun, 8 May 2022 14:40:16 +0000 Subject: [PATCH] -Numerous changes to make more generic. Use varialbe for username. Defaults to "pi - --- deploy_authorized_keys.yml | 22 ++++------- group_vars/all.yml | 1 + password.yaml | 2 +- playbook.yaml | 2 +- roles/autossh/files/autossh | 2 +- roles/autossh/files/autossh.service | 2 +- roles/common/tasks/main.yaml | 34 ++++++++++++----- roles/common/templates/sddm.conf.j2 | 4 ++ roles/common/vars/os_Ubuntu_22.yml | 16 ++++++++ roles/facebook/files/facebook.sh | 4 +- roles/facebook/tasks/main.yaml | 10 ++--- roles/ftpclient/files/ftp-session.sh | 2 +- roles/ftpclient/tasks/main.yaml | 8 ++-- roles/nrpe/files/nrpe_local.cfg | 8 ++-- roles/pi/files/autologin.conf | 2 +- roles/pi/tasks/main.yaml | 4 +- roles/qos/files/qostraf.sh | 2 +- roles/qos/tasks/main.yaml | 10 ++--- roles/salesforce/files/salesforce.sh | 4 +- roles/salesforce/tasks/main.yaml | 10 ++--- roles/samba-server/defaults/main.yml | 2 +- roles/samba-server/handlers/main.yml | 2 +- roles/samba-server/tasks/main.yml | 6 +-- roles/sipclient/tasks/main.yaml | 4 +- roles/sipp/files/startclient.sh | 2 +- roles/sipp/files/startserver.sh | 2 +- roles/sipp/tasks/main.yaml | 38 +++++++++---------- roles/sipserver/tasks/main.yaml | 2 +- roles/smbclient/tasks/main.yaml | 14 +++---- roles/tcgui/files/tcgui.service | 2 +- roles/vnc/tasks/main.yaml | 2 +- roles/webclient/files/cadaver-webdav-clean.sh | 6 +-- roles/webclient/files/cadaver-webdav.sh | 2 +- roles/webclient/files/webdav-session.sh | 4 +- roles/youtube/tasks/main.yaml | 8 ++-- vars.yaml | 1 + 36 files changed, 137 insertions(+), 109 deletions(-) create mode 100644 roles/common/templates/sddm.conf.j2 create mode 100644 roles/common/vars/os_Ubuntu_22.yml create mode 100644 vars.yaml diff --git a/deploy_authorized_keys.yml b/deploy_authorized_keys.yml index 6895ecf..4c0576f 100644 --- a/deploy_authorized_keys.yml +++ b/deploy_authorized_keys.yml @@ -1,29 +1,21 @@ --- - hosts: all tasks: - - name: make sure user pi exists - become: true - ansible.builtin.user: - name: pi - groups: adm,cdrom,dip,plugdev,lxd,users,sudo - name: make direcotry - become: true file: - path: "/home/pi/.ssh" - owner: pi - group: pi + path: "/home/{{ def_username }}/.ssh" + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: '0700' state: directory - name: create empty file - become: true file: - path: "/home/pi/.ssh/authorized_keys" - owner: pi - group: pi + path: "/home/{{ def_username }}/.ssh/authorized_keys" + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: '0644' state: touch - name: put pubkey - become: true lineinfile: - path: "/home/pi/.ssh/authorized_keys" + path: "/home/{{ def_username }}/.ssh/authorized_keys" line: "{{ pubkey }}" diff --git a/group_vars/all.yml b/group_vars/all.yml index bf7d9af..915f220 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,4 +1,5 @@ --- +def_username: 'mikepell' def_ad_workgroup : 'LAB' def_ad_realm : 'LAB.LOCAL' def_ad_admin : 'administrator' diff --git a/password.yaml b/password.yaml index 938f111..c2c3de4 100644 --- a/password.yaml +++ b/password.yaml @@ -4,7 +4,7 @@ - name: pi become: yes user: - name: pi + name: "{{ def_username }}" state: present update_password: always password: "$6$Vmob4l5KBg11gcNV$fY.hrffHEc9gpcFhVdEmW7tepxJURBmkgQhC7kC25VsxcfHAtlqEP6Cvm6nK4jtqndkaQ/I29h/MkKk8KsdSV1" diff --git a/playbook.yaml b/playbook.yaml index dd89182..fd276e9 100644 --- a/playbook.yaml +++ b/playbook.yaml @@ -48,5 +48,5 @@ minute: "*/20" hour: "7-18" weekday: "1-5" - job: "/usr/bin/perl -e 'sleep int rand 1199' && /home/pi/scripts/smb-session.sh" + job: "/usr/bin/perl -e 'sleep int rand 1199' && /home/{{ def_username }}/scripts/smb-session.sh" tags: smbtraff_cron diff --git a/roles/autossh/files/autossh b/roles/autossh/files/autossh index 1b94f6d..9c75a90 100644 --- a/roles/autossh/files/autossh +++ b/roles/autossh/files/autossh @@ -2,4 +2,4 @@ AUTOSSH_POLL=60 AUTOSSH_FIRST_POLL=30 AUTOSSH_GATETIME=0 AUTOSSH_PORT=0 -SSH_OPTIONS="-M 0 -o ServerAliveInterval=60 -o ServerAliveCountMax=3 -N -R 6666:localhost:22 ec2-user@3.80.203.168 -i /home/pi/SDWAN-Versa.pem" +SSH_OPTIONS="-M 0 -o ServerAliveInterval=60 -o ServerAliveCountMax=3 -N -R 6666:localhost:22 ec2-user@3.80.203.168 -i /home/'{{ def_username }}'/SDWAN-Versa.pem" diff --git a/roles/autossh/files/autossh.service b/roles/autossh/files/autossh.service index b162976..15d3052 100644 --- a/roles/autossh/files/autossh.service +++ b/roles/autossh/files/autossh.service @@ -5,7 +5,7 @@ After=network-online.target [Service] Type=simple -User=pi +User="{{ def_username }}" EnvironmentFile=/etc/default/autossh ExecStart= ExecStart=/usr/bin/autossh $SSH_OPTIONS diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml index 8b7b459..b599b0e 100644 --- a/roles/common/tasks/main.yaml +++ b/roles/common/tasks/main.yaml @@ -6,12 +6,12 @@ file: path: "{{ item }}" state: directory - owner: pi - group: pi + owner: "{{ def_username }}" + group: "{{ def_username }}" with_items: - - /home/pi/Documents/ftp - - /home/pi/Documents/smb - - /home/pi/scripts + - "/home/{{ def_username }}/Documents/ftp" + - "/home/{{ def_username }}/Documents/smb" + - "/home/{{ def_username }}/scripts" tags: create_dirs - name: update hosts file become: true @@ -75,9 +75,9 @@ - name: copy proc_check script and set exec template: src: "{{ role_path }}/files/proc_check.sh" - dest: /home/pi/scripts/proc_check.sh - owner: pi - group: pi + dest: "/home/{{ def_username }}/scripts/proc_check.sh" + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x - name: schedule proc_check script to run at 12:30am cron: @@ -85,14 +85,28 @@ minute: "30" hour: "0" weekday: "*" - job: /home/pi/scripts/proc_check.sh + job: "/home/{{ def_username }}/scripts/proc_check.sh" +- name: sddm autologin + become: yes + template: + src: "{{ role_path }}/templates/sddm.conf.j2" + dest: /etc/sddm.conf + owner: root + - name: pi become: yes user: - name: pi + name: "{{ def_username }}" state: present update_password: always # 'piadmin99' #password: "$6$Vmob4l5KBg11gcNV$fY.hrffHEc9gpcFhVdEmW7tepxJURBmkgQhC7kC25VsxcfHAtlqEP6Cvm6nK4jtqndkaQ/I29h/MkKk8KsdSV1" password: "$6$rmO12Z8HeUt6wQ$6JM550bdYBEQ22HWw2Ax1hKxawTDG5odoIFj6.RtHDUVs4jUVnqA.StSBr0HJiSw4Xnn2VBrLBxuZ7MLY820O0" tags: pi password + +- name: remove xscreensaver + become: yes + apt: + name: xscreensaver + state: absent + autoremove: yes diff --git a/roles/common/templates/sddm.conf.j2 b/roles/common/templates/sddm.conf.j2 new file mode 100644 index 0000000..9552be0 --- /dev/null +++ b/roles/common/templates/sddm.conf.j2 @@ -0,0 +1,4 @@ +[Autologin] +User={{ def_username }} +Session=lxqt.desktop +Relogin= diff --git a/roles/common/vars/os_Ubuntu_22.yml b/roles/common/vars/os_Ubuntu_22.yml new file mode 100644 index 0000000..c6cb1a9 --- /dev/null +++ b/roles/common/vars/os_Ubuntu_22.yml @@ -0,0 +1,16 @@ +--- +dependency_packages: + - vim + - mc + - build-essential + - openvpn + - aptitude + - mtr + - screen + - ncurses-dev + - libncurses-dev + - libssl-dev + - libpcap-dev + - libsctp-dev + - chromium-browser + - lxqt diff --git a/roles/facebook/files/facebook.sh b/roles/facebook/files/facebook.sh index 82a7904..bf197d8 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/pi/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/pi/.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 fdd2e40..43534a0 100644 --- a/roles/facebook/tasks/main.yaml +++ b/roles/facebook/tasks/main.yaml @@ -3,12 +3,12 @@ copy: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: pi - group: pi + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x with_items: - - { src: "{{ role_path }}/files/facebook.sh", dest: "/home/pi/scripts/facebook.sh" } - - { src: "{{ role_path }}/files/facebook_url.list", dest: "/home/pi/Documents/facebook_url.list" } + - { src: "{{ role_path }}/files/facebook.sh", dest: "/home/{{ def_username }}/scripts/facebook.sh" } + - { src: "{{ role_path }}/files/facebook_url.list", dest: "/home/{{ def_username }}/Documents/facebook_url.list" } tags: facebooktraff_script - name: enable cron job for facebook traffic cron: @@ -16,5 +16,5 @@ minute: "*/5" hour: "7-18" weekday: "1-5" - job: "/home/pi/scripts/facebook.sh" + job: "/home/{{ def_username }}/scripts/facebook.sh" tags: facebooktraff_cron diff --git a/roles/ftpclient/files/ftp-session.sh b/roles/ftpclient/files/ftp-session.sh index 8e223e8..defe042 100644 --- a/roles/ftpclient/files/ftp-session.sh +++ b/roles/ftpclient/files/ftp-session.sh @@ -7,7 +7,7 @@ ftp -n -v $HOST << EOT bin user $USER $PASSWD prompt -lcd /home/pi/ftp +lcd /home/'{{ def_username }}'/ftp get file.zip bye EOT diff --git a/roles/ftpclient/tasks/main.yaml b/roles/ftpclient/tasks/main.yaml index e754f29..2c4e243 100644 --- a/roles/ftpclient/tasks/main.yaml +++ b/roles/ftpclient/tasks/main.yaml @@ -5,13 +5,13 @@ minute: "0" hour: "7-18/2" weekday: "1-5" - job: "/usr/bin/perl -e 'sleep int rand 7199' && /home/pi/scripts/ftp-session.sh" + job: "/usr/bin/perl -e 'sleep int rand 7199' && /home/{{ def_username }}/scripts/ftp-session.sh" tags: ftptraff_cron - name: copy ftp-session.sh to scripts directory copy: src: "{{ role_path }}/files/ftp-session.sh" - dest: /home/pi/scripts/ftp-session.sh - owner: pi - group: pi + dest: "/home/{{ def_username }}/scripts/ftp-session.sh" + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x tags: ftptraff_script diff --git a/roles/nrpe/files/nrpe_local.cfg b/roles/nrpe/files/nrpe_local.cfg index 91fc9af..5e2e9bb 100644 --- a/roles/nrpe/files/nrpe_local.cfg +++ b/roles/nrpe/files/nrpe_local.cfg @@ -1,10 +1,10 @@ ###################################### # Do any local nrpe configuration here ###################################### -command[check_test_file_100M]=/usr/bin/sudo /usr/lib/nagios/plugins/check_file_age -w 86400 -c 1570000 -W 50000000 -C 10 -f '/home/pi/Documents/smb/test_file_100M' -command[check_test_file_200M]=/usr/bin/sudo /usr/lib/nagios/plugins/check_file_age -w 432600 -c 1570000 -W 100000000 -C 10 -f '/home/pi/Documents/smb/test_file_200M' -command[check_test_file_500M]=/usr/bin/sudo /usr/lib/nagios/plugins/check_file_age -w 432600 -c 1570000 -W 250000000 -C 10 -f '/home/pi/Documents/smb/test_file_500M' -command[check_test_file_50M]=/usr/bin/sudo /usr/lib/nagios/plugins/check_file_age -w 86400 -c 1570000 -W 40000000 -C 10 -f '/home/pi/Documents/smb/test_file_50M' +command[check_test_file_100M]=/usr/bin/sudo /usr/lib/nagios/plugins/check_file_age -w 86400 -c 1570000 -W 50000000 -C 10 -f '/home/{{ def_username }}/Documents/smb/test_file_100M' +command[check_test_file_200M]=/usr/bin/sudo /usr/lib/nagios/plugins/check_file_age -w 432600 -c 1570000 -W 100000000 -C 10 -f '/home/{{ def_username }}/Documents/smb/test_file_200M' +command[check_test_file_500M]=/usr/bin/sudo /usr/lib/nagios/plugins/check_file_age -w 432600 -c 1570000 -W 250000000 -C 10 -f '/home/{{ def_username }}/Documents/smb/test_file_500M' +command[check_test_file_50M]=/usr/bin/sudo /usr/lib/nagios/plugins/check_file_age -w 86400 -c 1570000 -W 40000000 -C 10 -f '/home/{{ def_username }}/Documents/smb/test_file_50M' command[check_root]=/usr/lib/nagios/plugins/check_disk -w 20% -c 10% -p / command[check_mem]=/usr/lib/nagios/plugins/check_mem.pl -u -C -w 85 -c 95 command[check_swap]=/usr/lib/nagios/plugins/check_swap -w 30% -c 10% diff --git a/roles/pi/files/autologin.conf b/roles/pi/files/autologin.conf index 951657a..0e5cfec 100644 --- a/roles/pi/files/autologin.conf +++ b/roles/pi/files/autologin.conf @@ -1,3 +1,3 @@ [Service] ExecStart= -ExecStart=-/sbin/agetty --autologin pi --noclear %I \$TERM +ExecStart=-/sbin/agetty --autologin '{{ def_username }}' --noclear %I \$TERM diff --git a/roles/pi/tasks/main.yaml b/roles/pi/tasks/main.yaml index d360e05..5616378 100644 --- a/roles/pi/tasks/main.yaml +++ b/roles/pi/tasks/main.yaml @@ -41,11 +41,11 @@ group: root - name: autologin replacement become: true - # command: '/bin/sed /etc/lightdm/lightdm.conf -i -e "s/^\(#\|\)autologin-user=.*/autologin-user=pi/"' + # command: '/bin/sed /etc/lightdm/lightdm.conf -i -e "s/^\(#\|\)autologin-user=.*/autologin-user={{ def_username }}/"' lineinfile: path: /etc/lightdm/lightdm.conf regexp: '^#autologin-user=' - line: 'autologin-user=pi' + line: 'autologin-user={{ def_username }}' - name: force systemd reload become: true systemd: diff --git a/roles/qos/files/qostraf.sh b/roles/qos/files/qostraf.sh index 3a1862f..c76f6ee 100644 --- a/roles/qos/files/qostraf.sh +++ b/roles/qos/files/qostraf.sh @@ -2,5 +2,5 @@ while read -r line do [[ -n "$line" ]] && ping -c 10 -Q $line {{ hostvars[groups['sipserver'][0]].ansible_host }} >/dev/null -done < /home/pi/scripts/dscp.list +done < /home/'{{ def_username }}'/scripts/dscp.list diff --git a/roles/qos/tasks/main.yaml b/roles/qos/tasks/main.yaml index 54f0424..dc972d8 100644 --- a/roles/qos/tasks/main.yaml +++ b/roles/qos/tasks/main.yaml @@ -3,12 +3,12 @@ copy: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: pi - group: pi + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x with_items: - - { src: "{{ role_path }}/files/qostraf.sh", dest: "/home/pi/scripts/qostraf.sh" } - - { src: "{{ role_path }}/files/dscp.list", dest: "/home/pi/Documents/dscp.list" } + - { src: "{{ role_path }}/files/qostraf.sh", dest: "/home/{{ def_username }}/scripts/qostraf.sh" } + - { src: "{{ role_path }}/files/dscp.list", dest: "/home/{{ def_username }}/Documents/dscp.list" } tags: qostraf_script - name: enable cron job for qostraf cron: @@ -16,5 +16,5 @@ minute: "*/5" hour: "7-18" weekday: "1-5" - job: "/home/pi/scripts/qostraf.sh" + job: "/home/{{ def_username }}/scripts/qostraf.sh" tags: qostraf_cron diff --git a/roles/salesforce/files/salesforce.sh b/roles/salesforce/files/salesforce.sh index 1ee3624..83be16a 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/pi/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/pi/.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 f3011d5..70fdf37 100644 --- a/roles/salesforce/tasks/main.yaml +++ b/roles/salesforce/tasks/main.yaml @@ -3,12 +3,12 @@ copy: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: pi - group: pi + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x with_items: - - { src: "{{ role_path }}/files/salesforce.sh", dest: "/home/pi/scripts/salesforce.sh" } - - { src: "{{ role_path }}/files/salesforce_url.list", dest: "/home/pi/Documents/salesforce_url.list" } + - { src: "{{ role_path }}/files/salesforce.sh", dest: "/home/{{ def_username }}/scripts/salesforce.sh" } + - { src: "{{ role_path }}/files/salesforce_url.list", dest: "/home/{{ def_username }}/Documents/salesforce_url.list" } tags: salesforcetraff_script - name: enable cron job for salesforce traffic cron: @@ -16,5 +16,5 @@ minute: "*/5" hour: "7-18" weekday: "1-5" - job: "/home/pi/scripts/salesforce.sh" + job: "/home/{{ def_username }}/scripts/salesforce.sh" tags: salesforcetraff_cron diff --git a/roles/samba-server/defaults/main.yml b/roles/samba-server/defaults/main.yml index 7e85d13..015443c 100644 --- a/roles/samba-server/defaults/main.yml +++ b/roles/samba-server/defaults/main.yml @@ -13,5 +13,5 @@ samba_group_name: smbgrp samba_users: - name: 'demo' smbpasswd: 'Demo123' - - name: 'pi' + - name: '{{ def_username }}' smbpasswd: 'pipasswd' diff --git a/roles/samba-server/handlers/main.yml b/roles/samba-server/handlers/main.yml index 1ec76a4..8ed08a2 100644 --- a/roles/samba-server/handlers/main.yml +++ b/roles/samba-server/handlers/main.yml @@ -6,4 +6,4 @@ enabled: yes - name: Generate Samba Files become: yes - shell: /home/pi/scripts/genfiles.sh + shell: /home/'{{ def_username }}'/scripts/genfiles.sh diff --git a/roles/samba-server/tasks/main.yml b/roles/samba-server/tasks/main.yml index 59967b9..f480d84 100644 --- a/roles/samba-server/tasks/main.yml +++ b/roles/samba-server/tasks/main.yml @@ -64,9 +64,9 @@ - name: copy genfiles script copy: src: "{{ role_path }}/files/genfiles.sh" - dest: /home/pi/scripts/genfiles.sh - owner: pi - group: pi + dest: "/home/{{ def_username }}/scripts/genfiles.sh" + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x tags: samba_genfiles notify: Generate Samba Files diff --git a/roles/sipclient/tasks/main.yaml b/roles/sipclient/tasks/main.yaml index 525c0fe..96a0bab 100644 --- a/roles/sipclient/tasks/main.yaml +++ b/roles/sipclient/tasks/main.yaml @@ -6,7 +6,7 @@ minute: "*/30" hour: "8-18" weekday: "1-5" - job: "/usr/bin/perl -e 'sleep int rand 1800' && /home/pi/scripts/startclient.sh" + job: "/usr/bin/perl -e 'sleep int rand 1800' && /home/{{ def_username }}/scripts/startclient.sh" user: root tags: sipclient_cron - name: stop sip calling after hours @@ -15,6 +15,6 @@ name: "stop sip client" hour: "17" weekday: "1-5" - job: "/usr/bin/perl -e 'sleep int rand 1800' && /home/pi/scripts/stopclient.sh" + job: "/usr/bin/perl -e 'sleep int rand 1800' && /home/{{ def_username }}/scripts/stopclient.sh" user: root tags: sipclient_stop diff --git a/roles/sipp/files/startclient.sh b/roles/sipp/files/startclient.sh index 8a9270f..8f60c85 100644 --- a/roles/sipp/files/startclient.sh +++ b/roles/sipp/files/startclient.sh @@ -3,7 +3,7 @@ if pgrep sipp >/dev/null then echo "sipp is running" else - cd /home/pi/sipp + cd /home/'{{ def_username }}'/sipp #./sipp -sn uac_pcap {{ hostvars[groups['sipserver'][0]].ansible_host }} -bg -l 40 ./sipp -sf call.xml {{ hostvars[groups['sipserver'][0]].ansible_host }} -r 3 -rp 90s -rtp_echo -mi {{ hostvars[inventory_hostname]['ansible_default_ipv4']['address']}} -bg fi diff --git a/roles/sipp/files/startserver.sh b/roles/sipp/files/startserver.sh index 239a9c0..66aea5f 100644 --- a/roles/sipp/files/startserver.sh +++ b/roles/sipp/files/startserver.sh @@ -3,7 +3,7 @@ if pgrep sipp >/dev/null then echo "sipp is running" else - cd /home/pi/sipp + cd /home/'{{ def_username }}'/sipp ./sipp -sn uas -rtp_echo -mp 6000 -mi {{ hostvars[inventory_hostname]['ansible_default_ipv4']['address']}} -bg fi diff --git a/roles/sipp/tasks/main.yaml b/roles/sipp/tasks/main.yaml index da7c3c4..d6a9938 100644 --- a/roles/sipp/tasks/main.yaml +++ b/roles/sipp/tasks/main.yaml @@ -2,14 +2,14 @@ - name: download sipp source get_url: url: "https://github.com/SIPp/sipp/releases/download/v3.6.0/sipp-3.6.0.tar.gz" - dest: "/home/pi/sipp-3.6.0.tar.gz" + dest: "/home/{{ def_username }}/sipp-3.6.0.tar.gz" register: sipp_source tags: sipp - name: Unpacking SIPP unarchive: copy: no - dest: /home/pi/ - src: "/home/pi/sipp-3.6.0.tar.gz" + dest: "/home/{{ def_username }}/" + src: "/home/{{ def_username }}/sipp-3.6.0.tar.gz" when: sipp_source.changed register: sipp_source_unpack tags: sipp @@ -21,7 +21,7 @@ - name: configure sipp command: "./configure --with-openssl --with-pcap --with-sctp" args: - chdir: "/home/pi/sipp" + chdir: "/home/{{ def_username }}/sipp" when: sipp_move_directory is changed tags: sipp register: sipp_configure @@ -29,41 +29,41 @@ shell: make when: sipp_configure is changed args: - chdir: "/home/pi/sipp" + chdir: "/home/{{ def_username }}/sipp" tags: sipp - name: copy scripts when: sipp_move_directory is changed template: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: pi - group: pi + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x with_items: - - { src: "{{ role_path }}/files/startserver.sh", dest: "/home/pi/scripts/startserver.sh" } - - { src: "{{ role_path }}/files/startclient.sh", dest: "/home/pi/scripts/startclient.sh" } - - { src: "{{ role_path }}/files/stopclient.sh", dest: "/home/pi/scripts/stopclient.sh" } + - { src: "{{ role_path }}/files/startserver.sh", dest: "/home/{{ def_username }}/scripts/startserver.sh" } + - { src: "{{ role_path }}/files/startclient.sh", dest: "/home/{{ def_username }}/scripts/startclient.sh" } + - { src: "{{ role_path }}/files/stopclient.sh", dest: "/home/{{ def_username }}/scripts/stopclient.sh" } tags: sipp - name: copy scripts2 template: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: pi - group: pi + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x with_items: - - { src: "{{ role_path }}/files/startserver.sh", dest: "/home/pi/scripts/startserver.sh" } - - { src: "{{ role_path }}/files/startclient.sh", dest: "/home/pi/scripts/startclient.sh" } - - { src: "{{ role_path }}/files/stopclient.sh", dest: "/home/pi/scripts/stopclient.sh" } + - { src: "{{ role_path }}/files/startserver.sh", dest: "/home/{{ def_username }}/scripts/startserver.sh" } + - { src: "{{ role_path }}/files/startclient.sh", dest: "/home/{{ def_username }}/scripts/startclient.sh" } + - { src: "{{ role_path }}/files/stopclient.sh", dest: "/home/{{ def_username }}/scripts/stopclient.sh" } tags: sipp_scripts - name: copy call files copy: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: pi - group: pi + owner: "{{ def_username }}" + group: "{{ def_username }}" with_items: - - { src: "{{ role_path }}/files/call.xml", dest: "/home/pi/sipp/call.xml" } - - { src: "{{ role_path }}/files/call.pcap", dest: "/home/pi/sipp/pcap/call.pcap" } + - { src: "{{ role_path }}/files/call.xml", dest: "/home/{{ def_username }}/sipp/call.xml" } + - { src: "{{ role_path }}/files/call.pcap", dest: "/home/{{ def_username }}/sipp/pcap/call.pcap" } tags: sipp_files diff --git a/roles/sipserver/tasks/main.yaml b/roles/sipserver/tasks/main.yaml index e4eaa32..b3aeb09 100644 --- a/roles/sipserver/tasks/main.yaml +++ b/roles/sipserver/tasks/main.yaml @@ -5,5 +5,5 @@ name: "sipserver" minute: "*/30" user: root - job: "/home/pi/scripts/startserver.sh" + job: "/home/{{ def_username }}/scripts/startserver.sh" tags: sipserver_cron diff --git a/roles/smbclient/tasks/main.yaml b/roles/smbclient/tasks/main.yaml index 1b4ef92..f85c871 100644 --- a/roles/smbclient/tasks/main.yaml +++ b/roles/smbclient/tasks/main.yaml @@ -5,20 +5,20 @@ minute: "*/60" hour: "7-18" weekday: "1-5" - job: "/usr/bin/perl -e 'sleep int rand 3500' && /home/pi/scripts/smb-session.sh" + job: "/usr/bin/perl -e 'sleep int rand 3500' && /home/{{ def_username }}/scripts/smb-session.sh" tags: smbtraff_cron - name: copy smb-session.sh to scripts directory template: src: "{{ role_path }}/files/smb-session.sh" - dest: /home/pi/scripts/smb-session.sh - owner: pi - group: pi + dest: "/home/{{ def_username }}/scripts/smb-session.sh" + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x tags: smbtraff_script - name: copy credentials to user directory copy: src: "{{ role_path }}/files/.credentials" - dest: /home/pi - owner: pi - group: pi + dest: "/home/{{ def_username }}" + owner: "{{ def_username }}" + group: "{{ def_username }}" tags: smbtraff_credentials diff --git a/roles/tcgui/files/tcgui.service b/roles/tcgui/files/tcgui.service index 3a88593..249c30b 100644 --- a/roles/tcgui/files/tcgui.service +++ b/roles/tcgui/files/tcgui.service @@ -3,7 +3,7 @@ Description=tcgui server After=syslog.target network.target auditd.service [Service] -ExecStart=/usr/bin/python3 /home/pi/tcgui/main.py --dev eth0 --ip 0.0.0.0 +ExecStart=/usr/bin/python3 /home/'{{ def_username }}'/tcgui/main.py --dev eth0 --ip 0.0.0.0 [Install] WantedBy=multi-user.target diff --git a/roles/vnc/tasks/main.yaml b/roles/vnc/tasks/main.yaml index 766ed67..053409d 100644 --- a/roles/vnc/tasks/main.yaml +++ b/roles/vnc/tasks/main.yaml @@ -17,7 +17,7 @@ tags: vnc_config #- name: set lxde in .xsession # lineinfile: - # path: /home/pi/.xsession + # path: /home/'{{ def_username }}'/.xsession # line: "lxsession -s Lubuntu -e LXDE" # create: yes diff --git a/roles/webclient/files/cadaver-webdav-clean.sh b/roles/webclient/files/cadaver-webdav-clean.sh index ed7bab8..174251f 100644 --- a/roles/webclient/files/cadaver-webdav-clean.sh +++ b/roles/webclient/files/cadaver-webdav-clean.sh @@ -1,4 +1,4 @@ #! /bin/bash -ls /home/pi/zip > /home/pi/zip/files.txt -rm /home/pi/zip/*ZIP -rm /home/pi/zip/*zip +ls /home/'{{ def_username }}'/zip > /home/'{{ def_username }}'/zip/files.txt +rm /home/'{{ def_username }}'/zip/*ZIP +rm /home/'{{ def_username }}'/zip/*zip diff --git a/roles/webclient/files/cadaver-webdav.sh b/roles/webclient/files/cadaver-webdav.sh index 7be8de3..08464e2 100644 --- a/roles/webclient/files/cadaver-webdav.sh +++ b/roles/webclient/files/cadaver-webdav.sh @@ -6,7 +6,7 @@ send "jack\n" expect "Password:" send "jackw4sh3re\n" expect "dav:/webdav/>" -send "lcd /home/pi/zip\n" +send "lcd /home/{{ def_username }}/zip\n" expect "dav:/webdav/>" send "ls\n" send "cd Training\n" diff --git a/roles/webclient/files/webdav-session.sh b/roles/webclient/files/webdav-session.sh index 1fe77d9..b4d3d97 100644 --- a/roles/webclient/files/webdav-session.sh +++ b/roles/webclient/files/webdav-session.sh @@ -1,3 +1,3 @@ #! /bin/bash -/home/pi/scripts/cadaver-webdav.sh -/home/pi/scripts/cadaver-webdav-clean.sh +/home/'{{ def_username }}'/scripts/cadaver-webdav.sh +/home/'{{ def_username }}'/scripts/cadaver-webdav-clean.sh diff --git a/roles/youtube/tasks/main.yaml b/roles/youtube/tasks/main.yaml index c85b7bf..2f15cab 100644 --- a/roles/youtube/tasks/main.yaml +++ b/roles/youtube/tasks/main.yaml @@ -3,11 +3,11 @@ copy: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: pi - group: pi + owner: "{{ def_username }}" + group: "{{ def_username }}" mode: a+x with_items: - - { src: "{{ role_path }}/files/youtube.sh", dest: "/home/pi/scripts/youtube.sh" } + - { src: "{{ role_path }}/files/youtube.sh", dest: "/home/{{ def_username }}/scripts/youtube.sh" } tags: youtubetraff_script - name: enable cron job for youtube traffic cron: @@ -15,5 +15,5 @@ minute: "*/30" hour: "7-18" weekday: "1-5" - job: "/usr/bin/perl -e 'sleep int rand 900' && /home/pi/scripts/youtube.sh" + job: "/usr/bin/perl -e 'sleep int rand 900' && /home/{{ def_username }}/scripts/youtube.sh" tags: youtubetraff_cron diff --git a/vars.yaml b/vars.yaml new file mode 100644 index 0000000..77c873b --- /dev/null +++ b/vars.yaml @@ -0,0 +1 @@ +uusername: mikepell