From 5e8c58b6ac7a2e8cc5bf1c390a8b29aad3c717e5 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Tue, 23 Jul 2019 12:19:27 +0000 Subject: [PATCH 01/14] Fixed up spacing on group stanza --- roles/shell/tasks/users.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index 0f0bed7..19d464f 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -9,8 +9,9 @@ state: present - group: - name: fortitude + name: fortitude state: present + #Service accounts - include: users/minecraft.yml - include: users/bzflag.yml From 7b698ae39c5178e4b81b199c01b0a2153e91b678 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Tue, 23 Jul 2019 12:37:09 +0000 Subject: [PATCH 02/14] Flipped createhome to yes, so ssh keys can be deployed --- roles/shell/tasks/users/fncdo.yml | 2 +- roles/shell/tasks/users/fncso.yml | 2 +- roles/shell/tasks/users/warcall22.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/shell/tasks/users/fncdo.yml b/roles/shell/tasks/users/fncdo.yml index fe730b0..e52e412 100644 --- a/roles/shell/tasks/users/fncdo.yml +++ b/roles/shell/tasks/users/fncdo.yml @@ -7,7 +7,7 @@ skeleton: /etc/skel shell: /bin/bash system: no - createhome: no + createhome: yes home: /home/fncdo - authorized_key: user: fncdo diff --git a/roles/shell/tasks/users/fncso.yml b/roles/shell/tasks/users/fncso.yml index f11f137..5d6a815 100644 --- a/roles/shell/tasks/users/fncso.yml +++ b/roles/shell/tasks/users/fncso.yml @@ -7,7 +7,7 @@ skeleton: /etc/skel shell: /bin/bash system: no - createhome: no + createhome: yes home: /home/fncso - authorized_key: user: fncso diff --git a/roles/shell/tasks/users/warcall22.yml b/roles/shell/tasks/users/warcall22.yml index b2d8738..8f6ed70 100644 --- a/roles/shell/tasks/users/warcall22.yml +++ b/roles/shell/tasks/users/warcall22.yml @@ -7,7 +7,7 @@ skeleton: /etc/skel shell: /bin/bash system: no - createhome: no + createhome: yes home: /home/warcall22 - authorized_key: user: warcall22 From b8a274aa195ec5d5e0882ce0fae88f8d748c24e9 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Tue, 23 Jul 2019 13:13:36 +0000 Subject: [PATCH 03/14] Adding jekyll for folks to use --- roles/shell/tasks/packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index e5a48ff..f26263f 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -94,6 +94,7 @@ - inkscape - imagemagick - irssi + - jekyll - jq - lbzip2 - lftp From 7428e0e2dfa92ddaa1dbb2f8cc4bc2941641da1e Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Tue, 23 Jul 2019 13:32:16 +0000 Subject: [PATCH 04/14] Added a bunch of static site generators --- roles/shell/tasks/packages.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index f26263f..b002126 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -131,6 +131,10 @@ - minetest-mod-pipeworks - minetest-mod-torches - minetest-server + - mkdocs + - mkdocs-doc + - mkdocs-bootstrap + - mkdocs-bootswatch - mono-apache-server - mono-complete - mono-dbg @@ -149,6 +153,8 @@ - openssl - p7zip-full - pandoc + - pelican + - pelican-doc - php-imagick - php-memcache - php-pear From bae417fa8cdbc966679a2e4ee818907bb8185638 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Fri, 26 Jul 2019 20:05:03 +0000 Subject: [PATCH 05/14] Updated repos to buster --- roles/shell/tasks/packages.yml | 6 +++--- roles/webserver/tasks/packages.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index b002126..715248a 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -24,7 +24,7 @@ - name: Add weechat repo apt_repository: - repo: 'deb https://weechat.org/debian stretch main' + repo: 'deb https://weechat.org/debian buster main' state: present filename: weechat update_cache: yes @@ -43,13 +43,13 @@ - name: Add debian contrib apt_repository: - repo: 'deb http://ftp.de.debian.org/debian stretch main contrib' + repo: 'deb http://ftp.de.debian.org/debian stable main contrib' state: present update_cache: yes - name: Add mono-project repo apt_repository: - repo: 'deb https://download.mono-project.com/repo/debian stable-stretch main' + repo: 'deb https://download.mono-project.com/repo/debian stable-buster main' state: present update_cache: yes diff --git a/roles/webserver/tasks/packages.yml b/roles/webserver/tasks/packages.yml index 2d3104d..218452d 100644 --- a/roles/webserver/tasks/packages.yml +++ b/roles/webserver/tasks/packages.yml @@ -7,14 +7,14 @@ - name: Add tor project repo apt_repository: - repo: 'deb https://deb.torproject.org/torproject.org stretch main' + repo: 'deb https://deb.torproject.org/torproject.org buster main' state: present filename: tor update_cache: yes - name: Add tor project repo apt_repository: - repo: 'deb-src https://deb.torproject.org/torproject.org stretch main' + repo: 'deb-src https://deb.torproject.org/torproject.org buster main' state: present filename: torsrc update_cache: yes From 1d6adbdaf658f6322b3d05875dc42798736b61a8 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Fri, 26 Jul 2019 20:35:57 +0000 Subject: [PATCH 06/14] Updated packages for buster --- roles/shell/tasks/packages.yml | 29 ++++++++++++++--------------- roles/webserver/tasks/packages.yml | 26 +++++++++++++------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index 715248a..628ed4e 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -98,7 +98,7 @@ - jq - lbzip2 - lftp - - libapache2-mod-php7.0 + - libapache2-mod-php - libarchive-dev - libconvert-binhex-perl - libffi-dev @@ -144,7 +144,6 @@ - mosh - mutt - mysql-client - - mysql-server - nasm - nbsdgames - neofetch @@ -158,19 +157,19 @@ - php-imagick - php-memcache - php-pear - - php7.0 - - php7.0-curl - - php7.0-gd - - php7.0-imap - - php7.0-intl - - php7.0-mcrypt - - php7.0-mysql - - php7.0-pspell - - php7.0-recode - - php7.0-sqlite3 - - php7.0-tidy - - php7.0-xmlrpc - - php7.0-xsl + - php + - php-curl + - php-gd + - php-imap + - php-intl + - php-mcrypt + - php-mysql + - php-pspell + - php-recode + - php-sqlite3 + - php-tidy + - php-xmlrpc + - php7.3-xsl - pngtools - python - python-certbot-apache diff --git a/roles/webserver/tasks/packages.yml b/roles/webserver/tasks/packages.yml index 218452d..0148d91 100644 --- a/roles/webserver/tasks/packages.yml +++ b/roles/webserver/tasks/packages.yml @@ -37,19 +37,19 @@ - php-mbstring - php-memcache - php-pear - - php7.0 - - php7.0-curl - - php7.0-gd - - php7.0-imap - - php7.0-intl - - php7.0-mcrypt - - php7.0-mysql - - php7.0-pspell - - php7.0-recode - - php7.0-sqlite3 - - php7.0-tidy - - php7.0-xmlrpc - - php7.0-xsl + - php + - php-curl + - php-gd + - php-imap + - php-intl + - php-mcrypt + - php-mysql + - php-pspell + - php-recode + - php-sqlite3 + - php-tidy + - php-xmlrpc + - php7.3-xsl - shellinabox - tor - torsocks From 11c99f75c6f25c53979a4259516852385e55f8a3 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Fri, 26 Jul 2019 21:55:18 +0000 Subject: [PATCH 07/14] Updated 10-ssl for dovecot, postupgrade fix --- roles/shell/files/etc/dovecot/conf.d/10-ssl.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/shell/files/etc/dovecot/conf.d/10-ssl.conf b/roles/shell/files/etc/dovecot/conf.d/10-ssl.conf index bf93057..86878b5 100644 --- a/roles/shell/files/etc/dovecot/conf.d/10-ssl.conf +++ b/roles/shell/files/etc/dovecot/conf.d/10-ssl.conf @@ -44,9 +44,11 @@ ssl = yes # DH parameters length to use. #ssl_dh_parameters_length = 1024 +ssl_dh= Date: Sat, 27 Jul 2019 19:36:14 +1000 Subject: [PATCH 08/14] debian 10 qemu pkg update --- roles/shell/tasks/packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index 628ed4e..3c7a80c 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -181,6 +181,7 @@ - python3-venv - qemu - qemu-efi + - qemu-system - ranger - ruby-paint - ruby-trollop From d5397d31502a2a326d10fb10df2f32ac04ba280e Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Sat, 27 Jul 2019 23:23:17 +0000 Subject: [PATCH 09/14] Adding user pavel --- roles/shell/tasks/users.yml | 1 + roles/shell/tasks/users/pavel.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 roles/shell/tasks/users/pavel.yml diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index 19d464f..e871264 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -136,3 +136,4 @@ - include: users/warcall22.yml - include: users/fncso.yml - include: users/fncdo.yml +- include: users/pavel.yml diff --git a/roles/shell/tasks/users/pavel.yml b/roles/shell/tasks/users/pavel.yml new file mode 100644 index 0000000..0e1ca53 --- /dev/null +++ b/roles/shell/tasks/users/pavel.yml @@ -0,0 +1,15 @@ +--- +- name: Setting up pavel + user: + name: pavel + groups: tilde + state: present + skeleton: /etc/skel + shell: /bin/bash + system: no + createhome: yes + home: /home/pavel +- authorized_key: + user: pavel + state: present + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDl+kCvE+B6vxxXS5wRHCR45ONlArcVr6cdJXVcHE54w8xcNsZzy0Kw31j18SunOmbfmDnR4TW/4/yFwBLj39K2vyMM0dQz/GeUfOyVdi9pSnbwti5lcgXRVasF7J/a/X6nWOc+fObaAXb17keQoozuI2RIfPZMJLCFb7B+CPzvn8zwDlblZRzR65dKjulVp/0L3aJPbFKjvKxlxA5ofZFl6WAfKtBnGOBwKD2FnDlsACCOtdR+9iMywHwPu8cNU146tgKns3OvzdymVCIf3HOgSs3mNFodMti+9Dyvi6exmkQ1yXaCOWtRPAHgDT9La1dEhV2LCVNzCeFWNGtYAyAP" From 0f1853bb342429b85e4c90c46364918c01625475 Mon Sep 17 00:00:00 2001 From: ubergeek Date: Mon, 29 Jul 2019 17:28:34 -0400 Subject: [PATCH 10/14] updated key per user request --- roles/shell/tasks/users/dalist.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/shell/tasks/users/dalist.yml b/roles/shell/tasks/users/dalist.yml index bd967ad..d179580 100644 --- a/roles/shell/tasks/users/dalist.yml +++ b/roles/shell/tasks/users/dalist.yml @@ -12,5 +12,4 @@ - authorized_key: user: dalist state: present - key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAo5E9L12w8kqRhm8jM44xVMEUNuEPt0GLc482G5g3GjWvur9kCsg48Ju53mSXtMyDT/Z+iRwrCyK6EXcIlzG0CrlV0uLXc/7RBA55PI6RPCFF2eBRlplscOiDaKykqB7tPPiPA6LoH1+W57sDGF1S48gF3AHKfRZ8N0n9vQsCW8uDFWq25m3KWFO8JZrAW4MOHMdzxq7JMpzOCC+iBYbbVL6XT+4nBPjN7PCxgj3JgQmBQGW8Xf1994aqPGaMP9DdbDGnDkHRs5SXcLh9tkq1kG3FzJ5680S77p1cZkck96UyoUkp2crgnnGfqp3Zn1m6u9pG81wQrZCfBjlWfW2Uzw== -" \ No newline at end of file + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJV8lNQTsNyg05rNN65QTnNtqMgBw0CSX0bO+5x7nGw4THWGU0nQkfiQtg1ra5HF+RIQyTOdlITBOhbQkkR5RQ/DVzKdiXnYRHU6dGn1/kRCeAHGnqh4ge+scuUSTOM6dLf6SgeMP9RywoT7BFZj/r0wfgq/IChKmnxG8wcmqHQzHtMLTkcYFSqQG4yDdQaEc37V/r7QhPAEdxLfRaOIWSgJ/QEzMEguSYpRkc0SguWitXuRGiI+SMo9BAeDWycYyqgJlDbTvB1RIMchYP2r5c8+5TtEm/saDmg8gRVDeVtTA0LCPTCWcjDHACOWBam298Eook+bMkyyAO+sBxoWkp" \ No newline at end of file From 5eb06bf3d48b4dab6df021a5f2d0dc59a0cb33e6 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Wed, 31 Jul 2019 01:03:46 +0000 Subject: [PATCH 11/14] rm php-mcrypt, no longer in repos --- roles/shell/tasks/packages.yml | 1 - .../etc/apache2/mods-available/php7.3.conf | 25 +++++++++++++++++++ roles/webserver/tasks/apache2-mods.yml | 4 +-- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 roles/webserver/files/etc/apache2/mods-available/php7.3.conf diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index 3c7a80c..e432a5b 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -162,7 +162,6 @@ - php-gd - php-imap - php-intl - - php-mcrypt - php-mysql - php-pspell - php-recode diff --git a/roles/webserver/files/etc/apache2/mods-available/php7.3.conf b/roles/webserver/files/etc/apache2/mods-available/php7.3.conf new file mode 100644 index 0000000..0758ea6 --- /dev/null +++ b/roles/webserver/files/etc/apache2/mods-available/php7.3.conf @@ -0,0 +1,25 @@ + + SetHandler application/x-httpd-php + + + SetHandler application/x-httpd-php-source + # Deny access to raw php sources by default + # To re-enable it's recommended to enable access to the files + # only in specific virtual host or directory + Require all denied + +# Deny access to files without filename (e.g. '.php') + + Require all denied + + +# Running PHP scripts in user directories is disabled by default +# +# To re-enable PHP in user directories comment the following lines +# (from to .) Do NOT set it to On as it +# prevents .htaccess files from disabling it. +# +# +# php_admin_flag engine Off +# +# diff --git a/roles/webserver/tasks/apache2-mods.yml b/roles/webserver/tasks/apache2-mods.yml index 4a25c43..2850dea 100644 --- a/roles/webserver/tasks/apache2-mods.yml +++ b/roles/webserver/tasks/apache2-mods.yml @@ -8,9 +8,9 @@ apache2_module: name: ssl state: present -- name: php7.0 +- name: php7.3 apache2_module: - name: php7.0 + name: php7.3 state: present - name: rewrite apache2_module: From 21e4c009a8037c977bca6807a4f0a9612bb0ac11 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Thu, 1 Aug 2019 13:34:51 +0000 Subject: [PATCH 12/14] Updating package lists, to fix playbook issues post-upgrade --- roles/shell/tasks/packages.yml | 15 +++++++++++++++ roles/webserver/tasks/packages.yml | 3 --- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index e432a5b..fb30ea4 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -94,7 +94,9 @@ - inkscape - imagemagick - irssi + - isync - jekyll + - ksh - jq - lbzip2 - lftp @@ -113,6 +115,7 @@ - libsdl1.2-dev - libsdl2-dev - libssl-dev + - lua5.3 - lynx - make - mc @@ -147,6 +150,7 @@ - nasm - nbsdgames - neofetch + - neomutt - openbsd-inetd - opendkim - openssl @@ -169,14 +173,19 @@ - php-tidy - php-xmlrpc - php7.3-xsl + - php7.3-curl + - php7.3-xml - pngtools - python - python-certbot-apache - python-pip + - python-potr - python-twisted + - python3 - python3-pip - python3-toot - python3-twisted + - python3-potr - python3-venv - qemu - qemu-efi @@ -206,6 +215,12 @@ - vrms - w3m-img - weechat + - weechat-lua + - weechat-php + - weechat-python + - weechat-ruby + - weechat-scripts + - weechat-tcl - wordgrinder-ncurses - xfce4 - xfce4-goodies diff --git a/roles/webserver/tasks/packages.yml b/roles/webserver/tasks/packages.yml index 0148d91..096e51c 100644 --- a/roles/webserver/tasks/packages.yml +++ b/roles/webserver/tasks/packages.yml @@ -30,7 +30,6 @@ - createrepo - dpkg-dev - gophernicus - - libapache2-mod-php7.0 - mariadb-client - mariadb-server - php-imagick @@ -42,7 +41,6 @@ - php-gd - php-imap - php-intl - - php-mcrypt - php-mysql - php-pspell - php-recode @@ -50,7 +48,6 @@ - php-tidy - php-xmlrpc - php7.3-xsl - - shellinabox - tor - torsocks - yum-utils From 1f9c817514d0e8bc04fbfdb8d8bd777ab736639b Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Sat, 3 Aug 2019 15:47:46 +0000 Subject: [PATCH 13/14] Updated resolv.conf --- roles/common/files/resolv.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/common/files/resolv.conf b/roles/common/files/resolv.conf index 3878a49..7fc937e 100644 --- a/roles/common/files/resolv.conf +++ b/roles/common/files/resolv.conf @@ -1,2 +1 @@ -nameserver 149.56.184.112 -nameserver 66.42.77.29 +nameserver 139.59.215.24 From 78747fe1dbb7169c5033cafc98b4f181708966fc Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Mon, 5 Aug 2019 23:05:30 +0000 Subject: [PATCH 14/14] Adding user quantum --- roles/shell/tasks/users.yml | 1 + roles/shell/tasks/users/quantum.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 roles/shell/tasks/users/quantum.yml diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index e871264..12022f1 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -137,3 +137,4 @@ - include: users/fncso.yml - include: users/fncdo.yml - include: users/pavel.yml +- include: users/quantum.yml diff --git a/roles/shell/tasks/users/quantum.yml b/roles/shell/tasks/users/quantum.yml new file mode 100644 index 0000000..82f31e8 --- /dev/null +++ b/roles/shell/tasks/users/quantum.yml @@ -0,0 +1,15 @@ +--- +- name: Setting up quantum + user: + name: quantum + groups: tilde + state: present + skeleton: /etc/skel + shell: /bin/bash + system: no + createhome: yes + home: /home/quantum +- authorized_key: + user: quantum + state: present + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnuaw+88Pjyu+yNBeQO8knLWwr8NyseIPZxiX8WljuBIw1u4e61gas3sSnaBz3r3CwY4yczv4MSA6AbmA+itFS1tv7FGuQnHIcimhzsGBXcC9232nzJFtZe3W5HUTxXnx74p7kn/0fNJkRl4ckvEeQR1AfmA+AvVsavbvVaE1YdtyA3JSiZ4lB7gvY8oQi2pPcXP8c9so+R3v3LfDX6TVKnYyQ5TCFBk/LqIQwVl0JEBJj5hHt1ppXr+ZrePgw3tT/a4q8FF9LZ/c7GN0FVbWBfgoUUJEuknMXiNk9xY+SLW4PgLBw1sBLYLGIN83wdcdFOolAlD4QbnEBvcN2zFpb"