40 changed files with 431 additions and 131 deletions
--- a/roles/common/files/motd
+++ b/roles/common/files/motd
@ -8,7 +8,7 @@
 https://www.thunix.net                         EST DEC 2018
 -----------------------------------------------------------
 brought to you by:
-     amcclure     naglfar
+                  naglfar
     ubergeek     fosslinux
 -----------------------------------------------------------
 For system document type 'man thunix'.
--- a/roles/common/files/resolv.conf
+++ b/roles/common/files/resolv.conf
@ -1,2 +1,2 @@
-nameserver 149.56.184.112
-nameserver 66.42.77.29
+nameserver 127.0.0.1
+nameserver 149.56.184.112 
--- a/roles/shell/files/chat
+++ b/roles/shell/files/chat
@ -1,3 +1,3 @@
 #!/bin/bash

-weechat-curses -r "/set irc.look.temporary_servers on; /connect irc://`whoami`@localhost:6667/#thunix"
+weechat-curses -r "/set irc.look.temporary_servers on; /connect irc://`whoami`@localhost:6667/#thunix,#meta"
--- 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=</etc/dovecot/dh.pem

 # SSL protocols to use
 #ssl_protocols = !SSLv3
+ssl_min_protocol = TLSv1.2

 # SSL ciphers to use
 #ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL
--- 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,19 @@
    
 - 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 Debian unstable
+  apt_repository:
+    repo: 'deb http://deb.debian.org/debian/ unstable main'
    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

@ -71,10 +77,14 @@
      - ca-certificates-mono
      - caca-utils
      - cmake
+      - context
      - cowsay
      - devscripts
      - dos2unix
      - dosemu
+      - dovecot-pop3d
+      - dovecot-core
+      - dovecot-imapd
      - eggdrop
      - elinks
      - emacs
@ -84,6 +94,7 @@
      - fingerd
      - fish
      - fortune
+      - frotz
      - gitweb
      - gopher
      - gnome-icon-theme
@ -94,10 +105,13 @@
      - inkscape
      - imagemagick
      - irssi
+      - isync
+      - jekyll
+      - ksh
      - jq
      - lbzip2
      - lftp
-      - libapache2-mod-php7.0
+      - libapache2-mod-php
      - libarchive-dev
      - libconvert-binhex-perl
      - libffi-dev
@ -112,10 +126,12 @@
      - libsdl1.2-dev
      - libsdl2-dev
      - libssl-dev
+      - lua5.3
      - lynx
      - make
      - mc
      - mc-data
+      - midori
      - minetest-data
      - minetest-mod-advspawning
      - minetest-mod-animalmaterials
@ -130,6 +146,10 @@
      - minetest-mod-pipeworks
      - minetest-mod-torches
      - minetest-server
+      - mkdocs
+      - mkdocs-doc
+      - mkdocs-bootstrap
+      - mkdocs-bootswatch
      - mono-apache-server
      - mono-complete
      - mono-dbg
@ -139,42 +159,52 @@
      - mosh
      - mutt
      - mysql-client
-      - mysql-server
      - nasm
      - nbsdgames
      - neofetch
+      - neomutt
+      - newsbeuter
+      - newsboat
      - openbsd-inetd
      - opendkim
      - openssl
      - p7zip-full
      - pandoc
+      - pelican
+      - pelican-doc
      - 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-mysql
+      - php-pspell
+      - php-recode
+      - php-sqlite3
+      - php-tidy
+      - php-xmlrpc
+      - php7.3-xsl
+      - php7.3-curl
+      - php7.3-xml
      - pngtools
+      - proot
      - python
      - python-certbot-apache
      - python-pip
+      - python-potr
      - python-twisted
+      - python3
      - python3-pip
      - python3-toot
      - python3-twisted
+      - python3-potr
      - python3-venv
      - qemu
      - qemu-efi
+      - qemu-system
      - ranger
      - ruby-paint
      - ruby-trollop
@ -182,6 +212,7 @@
      - scala
      - scala-doc
      - scala-library
+      - sipcalc
      - staticsite
      - stow
      - talk
@ -195,12 +226,22 @@
      - tcltls
      - tdom
      - telnet
+      - telegram-cli
      - todotxt-cli
      - vim
      - vrms
      - w3m-img
      - weechat
+      - weechat-lua
+      - weechat-php
+      - weechat-python
+      - weechat-ruby
+      - weechat-scripts
+      - weechat-tcl
+      - whois
      - wordgrinder-ncurses
+      - x11vnc
+      - xdm
      - xfce4
      - xfce4-goodies
      - task-xfce-desktop
--- a/roles/shell/tasks/ufw.yml
+++ b/roles/shell/tasks/ufw.yml
@ -31,7 +31,7 @@
      - 5154
      - 30000

- name: Create limits
+- name: Create tcp limits
  ufw:
    rule: limit
    proto: tcp
@ -40,3 +40,12 @@
    - 22
    - 587
    - 2222
+    - 53
+
+- name: Create UDP limits
+  ufw:
+    rule: limit
+    proto: udp
+    port: '{{ item }}'
+  with_items:
+    - 53
--- a/roles/shell/tasks/users.yml
+++ b/roles/shell/tasks/users.yml
@ -9,8 +9,9 @@
    state: present
    
 - group:
-	name: fortitude
+	name: cherry
    state: present
+
 #Service accounts
 - include: users/minecraft.yml
 - include: users/bzflag.yml
@ -29,16 +30,16 @@
 - include: users/redhat.yml
 - include: users/gokce.yml
 - include: users/r.yml
- include: users/brendantcc.yml
+#- include: users/brendantcc.yml
 #- include: users/dragon.yml
 - include: users/spanmer.yml
 #- include: users/panzer.yml
 - include: users/hawaii.yml
 - include: users/trip.yml
- include: users/xenialito69.yml
+#- include: users/xenialito69.yml
 #- include: users/freuddy.yml
 - include: users/ringo.yml
- include: users/hexhaxtron.yml
+#- include: users/hexhaxtron.yml
 - include: users/smtpsupplicant.yml
 - include: users/orliesaurus.yml
 - include: users/gooly.yml
@ -53,7 +54,7 @@
 #- include: users/ragnarok.yml
 #- include: users/jundi.yml
 #- include: users/rado.yml
- include: users/sata.yml
+#- include: users/sata.yml
 - include: users/wesx.yml
 - include: users/arda.yml
 #- include: users/larasaty.yml
@ -65,14 +66,14 @@
 #- include: users/mom.yml
 #- include: users/andro.yml
 #- include: users/hasbullah.yml
- include: users/riska.yml
+#- include: users/riska.yml
 #- include: users/naruto.yml
 #- include: users/pria.yml
 #- include: users/abimks.yml
 #- include: users/bullah.yml
 - include: users/dalist.yml
 - include: users/apple.yml
-#- include: users/logique.yml
+- include: users/logique.yml
 #- include: users/jumbajookiba.yml
 #- include: users/letamesis.yml
 - include: users/chuck.yml
@ -89,10 +90,10 @@
 - include: users/transfusion.yml
 - include: users/adam.yml
 #- include: users/audiofile.yml
- include: users/vgk.yml
+#- include: users/vgk.yml
 - include: users/cyphyx.yml
 #- include: users/krystianbajno.yml
-#- include: users/vigilant.yml
+- include: users/vigilant.yml
 - include: users/isaac.yml
 - include: users/moskrin.yml
 - include: users/southerntofu.yml
@ -103,20 +104,20 @@
 #- include: users/mspe.yml
 #- include: users/pidgeotto.yml
 - include: users/wie.yml
- include: users/tomjerr.yml
+#- include: users/tomjerr.yml
 - include: users/yximdoa.yml
 - include: users/dovahkin.yml
- include: users/philip.yml
+#- include: users/philip.yml
 - include: users/sancho.yml
 - include: users/thekingofbandit.yml
- include: users/golden.yml
+#- include: users/golden.yml
 - include: users/marc.yml
- include: users/stenli990801.yml
+#- include: users/stenli990801.yml
 - include: users/lytedev.yml
 - include: users/skirk.yml
 - include: users/serafeim.yml
- include: users/dot.yml
- include: users/virus.yml
+#- include: users/dot.yml
+#- include: users/virus.yml
 - include: users/mandelbroth.yml
 - include: users/victoralt.yml
 - include: users/arch3r.yml
@ -129,9 +130,23 @@
 - include: users/aewens.yml
 - include: users/dex.yml
 - include: users/vernon.yml
- include: users/xallmm.yml
+#- include: users/xallmm.yml
 - include: users/danielscode.yml
 - include: users/haakondahl.yml
- include: users/warcall22.yml
- include: users/fncso.yml
- include: users/fncdo.yml
+- include: users/cherry.yml
+- include: users/pavel.yml
+- include: users/quantum.yml
+- include: users/gonthey.yml
+- include: users/mononote.yml
+- include: users/aavtt.yml
+- include: users/zszoke.yml
+- include: users/neo.yml
+- include: users/init0.yml
+- include: users/lugubris.yml
+- include: users/syncore.yml
+- include: users/geetfun.yml
+- include: users/jin264.yml
+- include: users/camellia.yml
+- include: users/liesinties.yml
+- include: users/hijaben.yml
+- include: users/delta.yml
--- a/roles/shell/tasks/users/aavtt.yml
+++ b/roles/shell/tasks/users/aavtt.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up aavtt
+  user:
+    name: aavtt
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/aavtt
+- authorized_key:
+    user: aavtt
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC0YGBsjgBW8/LeXiAlDvnCSECJRtdU+baTSNmsVA3XwtcTBt2MVo6JkIbugOas+utC+m+lPipITK7JReRHMFNK9H4eT1fjp+Ed5iLQ2E2w+qwRN6EaDTHjpABEyGmRPxtPteQm3I8WvEf7aAzp+oNQ/m0ukiA0jXkq9bJJp5O4Lc+bIJgCVjLO1qan2fd7VA/MnpWFgFNERgs8d9EWulyQjPg6uPLOVpLKtwAzrJ+wXVZk+5+9qWRLD18igSNtfqdYgVcvGzVatxDtV2O15EYqcKZiAov3nBsR1BHyA9lq+Ad9PMcpuRoh/AkVhfonPsUYGVY6/8x/rGnuAj2n24gfiI5lsJxZOJ2s3ttwdh0EDsYY4eqjkYj4CwBKCHxPaZ57uDyy1luI8yi05HWB+KAoRX8gKiEz6VD1o9Gi48Pwm1u5SuA7lw7EKOpV3UmBIV/ufVcMpvSwFoxxn8ZVg3g6wXGZIzaF4zjuPZHgpQKZgjKZS8LanNphk/jOMJ6TOycQtacyhxEk/1uL74Z1sHZaG2Udevbjjo4oBL9bDu2u2drOH3fPWk6J0kgsSG31IcKSFPKjDkkCBmyU7FQuxP4EyrpIeJKnKm1bFznf676gasgsh0qhjC+IrC99wWGYF6GTv08CQcas/TzG2X13W8H6rMHXaRPJ9rFa3+nSZxIkrQ=="
--- a/roles/shell/tasks/users/amcclure.yml
+++ b/roles/shell/tasks/users/amcclure.yml
@ -1,7 +1,7 @@
 ---
 - user:
    name: amcclure
-    groups: tilde, sudo
+    groups: tilde
    state: present
    skeleton: /etc/skel
    shell: /bin/bash
--- a/roles/shell/tasks/users/camellia.yml
+++ b/roles/shell/tasks/users/camellia.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up camellia
+  user:
+    name: camellia
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/camellia
+- authorized_key:
+    user: camellia
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6rRK5Rb+HoXgNeEAyDE8nDEgnMYd60EB247iq7Jst82j9zpKxGvoiZ9r2gS3Ji4ACFTjiFMXqInC8rk/4eWo+rdjRBc9q+/cv+FhFlBpb+eUW9rOYY21SNYxeYc32J99jBi3ucukIUSSbA3WjD5+ehlPWt/oAaOJc9ZLse/vOjzjUrLlqYNv2fdrY6WKRnE+TGMQpm9/EKlJ99h6MoqWKp1ljyKVPTPExslPm1qEaLvUvsDr1w/R3O+/GOmFk4tEY6IBQqCeie7Te4U8TXLHjn1iYciuoWb9nEMrZs7nnKTojizd/M8ax1gM8Y2g9BdJj2IyLx7Hxj075lIhS+YuX"
--- a/roles/shell/tasks/users/cherry.yml
+++ b/roles/shell/tasks/users/cherry.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up cherry
+  user:
+    name: cherry
+    groups: tilde, cherry
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/cherry
+- authorized_key:
+    user: cherry
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBMkhQkuK6/FRfha3n9wn0VIURokw0KWt20+3asZJcAvTjMARTap8yPz6ThlCYAa0eTcgikLNIBjCvmxzdh6s7GeDmlCIcqQXH+ooybBs1w81tb3LEXw2PTrYtmZtQ1sZgasqSsOWcgNIoekBaK9Tz1DDScc3GT2xyOpW6AQOzakjN9Q4+sBxYvCrhxgTCK38KBAXPjDH8pfiPlKTyky/eoME2CqaKEUPHzepsD5CnAYIT97UzpW/EmBxU9NNzTInnqk0/nwGfeKzpNrd72tBVNGUNoyKyYhQRJ4rMF9uMc6nHiZ5d6mk9UjJYP+lBd14FgF8wYWKb6hN3KXG0b61rT8PYnrrUKlKVmmPW1VRIxYegPNa/wUdUNXIG9Ewjsgd6c2KHRhXlaGbbz5uiIKByLQ06DBhQjsn8SP3n0Itv07JZkteDtLN4sFTeGN60Dm5+d77es68op2zqdMCz36hll+viPnXYhXgDWpjON5bwn/xEpokwTp1V722P5GSKVT17rsv5b1JUk2Pjq3g9HdYdy2R5NCRPCF8OCJSjgSK0u2fwhvUU6G8ikA/SMcR4dVWtVk092aB7BlKCbWSSQlPLY60ooIvjGh2TvI7pbbj1uq81q6C6fZoWNXmVfsxxhRT/oZYbNPPsqotdshVNPliQmQL1d01rgjSXEYM3AvHT8w== cherrypi"
--- 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==
-"
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJV8lNQTsNyg05rNN65QTnNtqMgBw0CSX0bO+5x7nGw4THWGU0nQkfiQtg1ra5HF+RIQyTOdlITBOhbQkkR5RQ/DVzKdiXnYRHU6dGn1/kRCeAHGnqh4ge+scuUSTOM6dLf6SgeMP9RywoT7BFZj/r0wfgq/IChKmnxG8wcmqHQzHtMLTkcYFSqQG4yDdQaEc37V/r7QhPAEdxLfRaOIWSgJ/QEzMEguSYpRkc0SguWitXuRGiI+SMo9BAeDWycYyqgJlDbTvB1RIMchYP2r5c8+5TtEm/saDmg8gRVDeVtTA0LCPTCWcjDHACOWBam298Eook+bMkyyAO+sBxoWkp"
--- a/roles/shell/tasks/users/delta.yml
+++ b/roles/shell/tasks/users/delta.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up delta
+  user:
+    name: delta
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/delta
+- authorized_key:
+    user: delta
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC5rF39vEkmTZ5g+YXOTNUrF690S/fnAjqRprsRD2zYClwNJh4AkzZd+sosYx2/DkdcC1Og1YfImu1Zv2kty/AEzaB63/BbS1m+OluvLSV4mIzFJmKWWzaQ1tq9/VHUjH095Wulz4lo0x50R5SLWoRIouPUNGcB3rv5AMxPznKf6P0fkaU1w/dZJVxCru6qO1PDCJ+BaRA1ZKB6U0u13Qwq4ZBM5gBYJ70/0l0G/wxZUe6ead73L/eBztrDL3Rm5cvNuSGjWC7GXpiFz/27oICXsUrtFQ/ITcFcNNq/LbSDix1fUyJ1V/ono+WL6LTbmGtI3aLcHHg7GnB2rqAXTNySpX3CVayvrfeQyh6O5Ukt1tFVcQbqAeLzLvfloIyVnA3Ds8tMPaGnBTpXjRfM88NyUUFnqP24SBAOzbfnr7kLv+Pyp1HvogeulCusFnALAMwOqj/HQ6OXIP4tJ/xxoApYktLkh/radggIrGzhZx0dd6QDNi0AA3rlXwYwgK6xwu8="
--- a/roles/shell/tasks/users/dovahkin.yml
+++ b/roles/shell/tasks/users/dovahkin.yml
@ -2,7 +2,7 @@
 - name: Setting up dovahkin
  user:
    name: dovahkin
-    groups: tilde
+    groups: tilde, cherry
    state: present
    skeleton: /etc/skel
    shell: /bin/bash
--- a/roles/shell/tasks/users/fncdo.yml
+++ b/roles/shell/tasks/users/fncdo.yml
@ -1,15 +0,0 @@
---
- name: Setting up fncdo
-  user:
-    name: fncdo
-    groups: fortitude, tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: no
-    home: /home/fncdo
- authorized_key:
-    user: fncdo
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDrpTDkkOMR6Mw4rmOAjefoaBQrLm06Bl652PCYvvgK3gAl33pWd3zZhVKFUxwjHg5P+k0YEpZttruDozYdREllWbNpb6rT0hmaaOy5P3SJTqBHuGQCrLLHByiz/yGsq6drgvi9D6jKY11tdV1GvTZALSbPdgkjhe1tcWMDfWrebtJlb9w5fuLxUqbNFwJjxVrKwN59i75UA1IvZiuW5PudgKW6kSYmoqJXRQFZLJmP2wje8cFJURH1TY0Z/FVZch5mYYvwTd5pNpu6PQcbZZG5LBE6DoTj6/hkpnmZ4LgozaAXyD7Tv9ZCenn6GwC6JdqA6HYltn6jqt/0biFlNsJ2uLRT1vRRJdoAoosQJs+jYBe0yvvFEpcqVOoaCBBZUYZ6mmW/GvT9pwY5iGP2Qw/3ve0BYiUDpMel/13GYQZwKAYNy9Vlk4lEi+JPIVdZCXclDpZH5LoguEfN7HSduaoFoTyhny3GLZHPvlYVA3fdNRp4KiLpT0GmmoamewfbofZWbb44/+dvUv+tGcN+cc/MX6tvghh7TFItPQL6yMDSxz4nZnWQHGPcg5Y2jNkUDB32Vu3c1dVztrwaRvN49CN+CDvc+aOoQH4mOaEMLzAStrPwxVMW1jC9ttQOonwMy/k08gqljCsN0toezp8RE9iVVHfLaM/NA3MZJypRP/G7Fw=="
--- a/roles/shell/tasks/users/fncso.yml
+++ b/roles/shell/tasks/users/fncso.yml
@ -1,15 +0,0 @@
---
- name: Setting up fncso
-  user:
-    name: fncso
-    groups: fortitude, tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: no
-    home: /home/fncso
- authorized_key:
-    user: fncso
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4MUrNrI9CxASXMK84VWwbTvQFlAoX5XHuxWplIZYNA6GYbAcFEqWB07kG1lNDiX8mZYKWHCRqS51vofXv4OqBICgnooWv0QRV9Zt/vCqO5MEzDN04+RpAHTZbFlhU5hYsUskZ67uQTla+rXHxBTmf4smqCxQi7QhVZsLsL2k1WsDkiOkYwSyQ2DJvyU/i6kAZ0u3mkzhvq8qTF4pQomsOMyvtjSPybObft25qwZdGaS6zG0ZKJ1+IXUaNqKoA0FjpqZuVhxiAiR6BaNlhyYCNLlg8X+2FWEUIgfeBU+pO8PtInCVLG6UHY1YlxtNx5uI0OlR1WbZ7Bi4ckF7+HoaolZP3MuMRTDiIY9AVvECwwMr/DzfXgQUVqEZuzASfwT+gLPnto6uMMItHNzqZVqZSzZ5FL8xYonEHJkGkrkGbdz7YN6qG6nCWlid3MtWCYO9U7Nii+ZsEzHk6Okviu89sRkQFIsoYB1UpOvCLZ40yCSPkYs5jxv5O/7M0IGH9PFHncEidGdPry4gshWZYZ+fXBqFBP3+4fLOKg98SLecYP6CFFi2QY2D2xIiI3i1xfZyLheNr+k4UNbPK7fkDU8DjTWk7OqlyHm3MdZUcUjchGxhkPGoawsrQPgyH22OAnRnsZ4/T4EnDjBIsstwzUUlNTbXkx/XFlzBk0ApzudNKNQ=="
--- a/roles/shell/tasks/users/geetfun.yml
+++ b/roles/shell/tasks/users/geetfun.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up geetfun
+  user:
+    name: geetfun
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/geetfun
+- authorized_key:
+    user: geetfun
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlIFgcfUkYQcWmpEorfc744cShENLDvtdI5LvBfxs6xpuhTEEAMItkSApwFPqmeSNQLi7BNdzfSZHtdghmZQguatJ8OF+NH4SH091GsNyXqh9a+Qo8a5Vm2HMrqgFXFMwHnQj9gQNhgjVlGsr+hX+on2hMC5x5lPYQGLkvPS2AZ8T15C160s4mcxCYemdDtPC5GqJgUI2jK25h9/h4zprcsoUXqkdFYDLDDYmpzLV+u8boQB8egQIozWE2EGvtQQOw0kzJlZW/uzzbq/uankOqozJTpcWYvLX2hhKQrzx6phiSBucY56CNcPDPM8sG7Yhpclf3oziycg+5SD0Dy6+5"
--- a/roles/shell/tasks/users/gonthey.yml
+++ b/roles/shell/tasks/users/gonthey.yml
@ -0,0 +1,16 @@
+---
+- name: Setting up gonthey 
+  user:
+    name: gonthey 
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/gonthey
+
+- authorized_key:
+    user: gonthey
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgmmy19v3UjtT1l+olQGsPTRaiRMdgMc9tixW2p+AQIkgLRZRgcO9suvrh78uWecgoG5vPh1eFmKUHZwxm30YmXEr1HNqCYP/FAMvJ7oKr7glwzlAsBw4eheqOOKskmQ2iuRLN4YWjqSHIyZ3HF3xavH/LeC6UrM9ulOMvLMBDNWCtHNpdS6wZWP+Vl+glBZuBl/f1LzaJ4IKF+5GIztpVmNo/eIhnOLp9d8djLh+RM8m/bYNBZDVw+GxNs62q5rKvZMeqhUjmB4/eg4iq22n+9w7vhIHqOzuzdJ/K/MZcr04EY3UA5atBlOCcsoxUUMx6xVgQVj5CI/vLW4JSPnDp"
--- a/roles/shell/tasks/users/hijaben.yml
+++ b/roles/shell/tasks/users/hijaben.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up hijaben
+  user:
+    name: hijaben
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/hijaben
+- authorized_key:
+    user: hijaben
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHBTg3UFXlwOEp90wNk5EN2tjUapWgkyiYyslIBtZWo+Wp+Xssg9UluU7aTiHUxOWYbz/DOD0ahSnk2UsMQCGd8Jubw17ec8GwcKDuU9UBtRjY43NIbbcsr/tEK4ZCm/x95UTaicCYbk06AxAHD6eYP98ik5H5klrbqDicD0/HV8Ozb90eBzetQiiRmrrzfQsxP0KVr1+ghebppl1Bb25vwuBJYEZm3KDEcsfCsrZcx30vqYuOUuMyBZ5zCm1cM2O7ycCfjzWcsGDAxhMXY4nBnux5XYNuRuDKQMJGaJXkfqiBoW1VYWIIZ64KyAkMCYFCLAqAMjqXGscvxwe2pWYJDxWOd809pqUkHobPHJP0jAsslmDZRoML/D4pSzaFrKJbKMQRj1JTdnge9KNAKXVxG6RsyLcPyhp0s8gRdJAhxV8+mFdqBodQCGVMKYXgAfd9O1B/z1wvuqRGsPF3QbrQ5Qty+RO8u39coLHNVmzObXP3TNnH5XHWXtAu6uwenPjcLvdB6mJmHKw2VN89Wg/wONKjz6Vha5bhz9BnaxhZZeBOdI90mRj8nmwIsOVCwiNjikoD+D7u2dlak3p5n+iPe34WS4vmZhxIZdxGe5X0/MHnNQMWdpfdMtQa4WT8eq2NdnyVHa8NFls714fTiqtUrCGjplDlthBw1QArqcKgCw=="
--- a/roles/shell/tasks/users/init0.yml
+++ b/roles/shell/tasks/users/init0.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up init0
+  user:
+    name: init0
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/init0
+- authorized_key:
+    user: init0
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCpej7dYLg3vPS9yxIxS2ahM9piVEZaxcY58S/Jq32FeE9qua8cZYeoUfcJ4DxAkqEOpc/7KmOVLNHXdtuVngV8mdgafAnSulzyM5PLEc/NngqFt0kEITZmNcy0X0SP5Ds8r/VETkiMe7JsQlAeJLhbA5E1sgSjnONJflVFgN8SXL8bntxp/WhDyn3/EeD8dRf95Nba5hsa/3rqhb1TXYCIZQSHHxWUZFL+YRB0YWPz8zuZbH2ZN3ViaonA3JJSr2e0lukK519sGlNqRGvcvEz/VUdblKMz1jjhSp41KxvCJ9nEqapsW+EzfnQ5lAq8+bdrIgN1hZKOrm5aLjg/PEkLi3w+rAdmQeIepuPz60462W83i5ZzVHK/N9HN+T7fr7L9pp6inTJKFA72V4vSQU6Q8YTaVHiwMwEwxnVHliLgg6h7B+BBGaz5XGvlqcwIhlGa78v1jfiJXCRdqeE4dGJZywbg3oGw86pSSea6TvE9nIsg1IvfClCvADVY9g5XtRErtinzTylvVDWyjrHrmqyqpzrM3t6c70QCmqobDfFvslrAnC2HmpAFVfxDPc3PJzMblBh1KqLu2+cpavPx72CcO+yrb1A/2Kzxb6daBtuNyE9MVDoiwuzMQrF/oHwBRsCa0KDhvg94ueNyQGPT+ar1r0LI94FUB1dD1nZ+KwFaHw=="
--- a/roles/shell/tasks/users/jin264.yml
+++ b/roles/shell/tasks/users/jin264.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up jin264
+  user:
+    name: jin264
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/jin264
+- authorized_key:
+    user: jin264
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJejBXlytAr0Oe/xWlr/s/WZmm0l54ES1H9VY/YS5xdV8OcqyukFWhSixq84zMsV5uWKwO3ZGshsQsQBHQwgMHU4em9TMg1JkzlcRjfWiZ3s4RPpYm10sUigCOLvs93g1Nhjk8lI/otUm4LUtQNhlVSOsU/jwOhAR5sNhzYvzKrLzDO3CL5+KcXo+Olt5oPnMSlGumLkkcR/LRn8jgXxlkgjqD6cvADyaqY0n7hwSQD7YHLUJMpALiryY1EBrqtXgiEuHGXLE6SnyxFMDgzyLYOEAfmoL3v9Hy8KY17z9uahJrI0Js9WGq6UYx2BQKidpJ8vxB2L75ND1WcT+0NxBN"
--- a/roles/shell/tasks/users/liesinties.yml
+++ b/roles/shell/tasks/users/liesinties.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up liesinties
+  user:
+    name: liesinties
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/liesinties
+- authorized_key:
+    user: liesinties
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFIWBjHV44D3HaiJ2t3r49OMECyKqFYde3nVUCqBgI+NqGUXFgtqc3qhdGTq8M3OAithWE9Q5J70ItgiWUs6NaMv/0F9bDNqTm18cYbDKM2PBwj1H7qfhnkphw1rOlocWR1xgMXdTn0523rAEJbAsWu4KnZLfp2+fmIcMHprquzXkT90CI85n3XOnYu+kIFVc+uGaxITDCWwNM1qjfhEQXs0DeJ7HWZKy90BB7GXU61VLB2n7JOXvR2eYQ4yWDOWXXoAR0kDZjgEWuXF1v76su9qIgSCcaRZq6tuYiqwt8mKtapU8kgNn7+/GL2LqMEFW6lpiHDFYSYenpi7P4CdMYJgnwf4xk0c6uKeBQC7YmyB6j7jmL83JEUnYMMNU982FW/Rx5YRBHG4PDeyiMfus2FZ7UnLmf7KukB+dMspL5cNzil7hiEGycUblJY+w853+8Vm5zdbWwJlONJtnc1eFLgu0/Bv44DrG3DmfbpfExmN2us8rVtr3Y/W6sX3tLgY6ObeLxnq/8kPs6N2OsW9pTkssaVKpQixdOt3esp+m2LyWEaYheTlNTOuF+NqEgzyFCW/uPIWDctfjdkVmusoN0XIj/3AXhliTNKm2s70BZBHKaVIMhJQJX15m/Lsn6jgH+D93YGRzuMV78kafEcudvTnXNvZfCt2UaZKT8Q8FghQ== liesinties@discordia"
--- a/roles/shell/tasks/users/lugubris.yml
+++ b/roles/shell/tasks/users/lugubris.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up lugubris
+  user:
+    name: lugubris
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/lugubris
+- authorized_key:
+    user: lugubris
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbCgbfX9AdwoeX+SEoRwK+c4j7mek7hOGqIyQ5r+W0VrDjKiHcg/5I5Mr1GU+y8aFmAnwPgnY17fDEopVTwIW0r2CyGaUx/tnEl97TTY5sROZiEjxiaxxAEk1xqrpY2PM4JVmCcFFQaYxVDsjJaI5PTPJSRrbrqW4nOfGXJ73q8RF1hH3N+AQO4aPqCqGWFF7BKIVbUcD6KOwiXqd1EIAibsljwdOed7gTvUR+OcIUO4HJRZwSWUaE93NqQh43q3TQAiJk3rUzCkK1b08xkAVzZ7coCPWh6wA7EL63eh0Yzg2/BXHsdNRRETlDjcMa+Gb+vSEhL+O8pGBkZXgeBN5LHyUCkNBdGoGQGAiC/N8dI2EO5bHoOrDmMzZKgo8Io6JTZAYVhTrPG4zqHkLywFVfJMsLEyVBGMwCXnhzVi1tQcDV/HMoQjJZjuNmhWR0fP4UUr57VcDmYMHRfFdzZJAymeRPjN+EH/roRS+Gbocs6UxxVyd92LsmzRBuFRmKtARXY/VV7r3HQBFXV8KFql+Yy0gd+AIk6/5i7T0/EAbJnUcisKDEGGjirY+NPRo73GcAobW5F2FiE49Haa4sXL8UvJm+5mT4npMXs6FuQ6NIV8FfkMxvkMCivZeN2ZVYXGVlhunn4Igd+T4RaRV83x9SdBvOAt3wXoyPrUxHF868iQ=="
--- a/roles/shell/tasks/users/mononote.yml
+++ b/roles/shell/tasks/users/mononote.yml
@ -0,0 +1,16 @@
+---
+- name: Setting up mononote 
+  user:
+    name: mononote 
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/mononote
+
+- authorized_key:
+    user: mononote
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDXb4LJcCXSgDe4bL+BH1IKcLJT4wWH70Jbc0WsCs70P/EPXsSvH2I0x5WtIwbcpMpuSQTNRu1S3SIJqvdEnT47kShs1YMvdiDy1SKWyUKMsp6rWC1LuQTcgnIJcP8XCRdpoMiwbqMnWpk26PLZ+NpU0vLhf4UeHvmZu6et8IIc1igclJDGfkFViQ9AIk2KZPK/8tYyQmYxqgJk4Vi5xRebOfohjRIh9pWMktRrSv8V5sV5VMLoXB3cwN7BmTt2/SsRsZRNUQvZUjqFDuuKjsGE5btuWA3vN1mYx5gVMEbdPcGWwmc/oaophW5SY2HHy+7UJEZSwx9idoSWUHo/Qkue1Zg+nmjRhUM6jFoJZLEmVAjOSGKOSfETzcbpyj6AHIgqOZmfyS8PbKTc+qjp+M8102BhBtqqNGxcRIRauE3WvHjNAD9Md7l2b14obyaKD7x/tYXaVawFufJ6nS2fszV46hT4m3vEV7qFESK48zGZN9Dhr5uN0Aj5N9qCOMjLt5wuMWL0NCzwGzfOL7jkgQ+bWpySlSADclWiRXSq5kOtJGMHOdbfKvLYFSE+YV1SAsb56Cw/Bcb7+ivLU2HliMl2XN4uA7aF4bB1YZiEIYh0UqrCOkKyGkmvs0Xsh0N/Du8mux0uxQsqv1N3iENma/9q9ur5bj3E1Ncyr9rWBLSLdw== marco@archie"
--- a/roles/shell/tasks/users/neo.yml
+++ b/roles/shell/tasks/users/neo.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up neo
+  user:
+    name: neo
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/neo
+- authorized_key:
+    user: neo
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAxp8lfL6GrIwnAlzjNdrs2LwCPc+cMqUr8+YP+8ji5SinchzVMWw97zdDw5oX7Ne8N4FouC2/DGzlNB+fZFG/8FxFUw6RR8Zmt1pJwlq3PQIsPmrgD/jfU5FSMbYlia5rnOoOK/10Pu+eGyCeZAWE70G0r7FC0sFbxxgaorv3TF4AetZPlsuBsZZTI9UYjrBzHcRo+ZksRJu7yTCbjF9oXsLLV2/udIWNbP1ZvNuqLlwMqrbL87NfJQomF+ubgsDW2M/KW3bv+cUxwJAjLoHPf48QSVewtdv/0nhCxBDdbrSso2jOMeguyp4YXJu08P92YfCOSA5HivU4l+ptFwnuZw=="
--- a/roles/shell/tasks/users/pavel.yml
+++ 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"
--- a/roles/shell/tasks/users/quantum.yml
+++ 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"
--- a/roles/shell/tasks/users/syncore.yml
+++ b/roles/shell/tasks/users/syncore.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up syncore
+  user:
+    name: syncore
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/syncore
+- authorized_key:
+    user: syncore
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDgGvOR6xuQ1TUxH0c9BPzwV7v766j1FhG+LpbH9Soeh3gx0TVVI5wbsLNpy2ttN+VfwTKZnz0MwO0SP/rStP26MiRz6CY+jDTLJxa+pW5Eujx2cIrXOg2fCj+v73v0BQDdGo1DKosRKf7ElnMosYq8Mpf7EFBj7eTUS3RtRAEaCbsWkgPpqEGcSifZX/LXlcrucAkCcNFoaVPdfD2dOBbnsBn7rPqS5vOdzvFTKuz8qQRynAG1eiYyYan9T+FSRljp+Nbwh0LwdXlnGTv76coT3kEEeTFOY9WE6P1n4pY0u0cDvjaXZ7jrCK+zgCpW0MdfEfsPF33c1UvMeHPk1iF1PiQtBY32c9Wg0h9NFPY5Ujh9GNJLVt9jDxL7FzPMIh233xDWT5aPgy7yIBetYVqSPrubhmEJBRhqgCu2bFsJ3BD1uN0AoovRmhn4VCy4OO0DJ0BTxEh9mb9xqcuRpkQDmbXacM/yhOvVmkzjI8upQHIT54Uj5v9cJR0zQwN3EOe8TefnWviYTzu1xSQX4DT8qYuyPn1WWeehPa72H/KlZ9oFG4dQ8QVeIjuHH3BCnmN7lkn9bUsaZ/OYDN71q5vTE71n+dBurTpeZTDsN9GH1uDrtJs1oCPbwEHM3tZWhPsKbwf7LOUqlrPephEpPhiaMlH4YIaPOH38/lX315Zhww=="
--- a/roles/shell/tasks/users/vigilant.yml
+++ b/roles/shell/tasks/users/vigilant.yml
@ -12,4 +12,4 @@
 - authorized_key:
    user: vigilant
    state: present
-    key: "ssh-rsa AB3NzaC1yc2EAAAADAQABAAABgQDMb40HQyjkdHMEnsrWgfeTcecCsapCm3D4+h00RmMjSlEWMgtWs2rrODEV8tVJfx8DRNxPvTtqbKS+GDimiHRMV5A44TVKoMKsaSMu8mH4yP6FkRL5uBOmCkUw4vLOolRDoEAOrH0/7grWEAue4csHT97OjHaSzc0o0Wnk/4j6k+TNTAKW4tgaV5dxEq4TMunjB0Hx5SNhoKk/1CNr3PUWZ+A5f6KH0ThFFum1jHzSbFq+7GcdNrQjYPJxueW0LRHeLmp/YbVJFV1c2VZ84pDTCNeWZ9VxXHiE0CfcXKpLc6a4u+acgnuxiNVnm2/E31ogxxjZ+RrHi4mXeELPJlPRBOia5c0yn7GiIjNl/BHnMwYLFfatQj1JWlHNP7b3InghkkHTWovq6vVAn040gDCzV980VHGm+3TEz7gA7IYqkfz9ZYmiZECc+mJuBvPu4E3rSlbnNOd5oeOUqApFcBYOcQipRBSYD3Cq0OJqwcdwO14f6sCOSUFC/WV301bau+E="
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDPhQgy6B10+M3J43D6DphSEsLUI04UlBNrJRaOrHcnXVHob87Bk+JylaizJAwTs6oQelMMc94xPqK4HSWcXZR3RinirdR4fzjttYRrMTneB2lFqi1iK1MxaxnDgsspwBJWPZgEaPRvf+/x32vFo2zJQCFv9HB1iXYOVNKriPb3NBn5u8Xrsvhbyriw0TaSU5KMX4slYRFgbBC0V4fgOqbgVNh9NjxXLFPua/YAp3JK0myfe/l5tCoD77PrFB102gb+yKrwkWnfmVrsqSt8wppU6PJx8fN2Ce0ddyRJZfcJ5pgGp0N1knRH9Jz2S0vicI3LZX/Ad2HuiYz/lf3SQ4dNGJOzTAhgRTUcdjLZGcPagDkrPLUD2Y1AJGTZnc2gYCp0fDVQMIPZRG982xA//t+Da8URxE6bDDcF53H/nkxbBCJhuqqZg54WijzF7YjCiDjb5ueg6Ok67R0D69EKr99CxHh/nbAcMi8sIFU6vTEmHMjW/tovr3PHsX+3sGI/9lE="
--- a/roles/shell/tasks/users/vnc.yml
+++ b/roles/shell/tasks/users/vnc.yml
@ -0,0 +1,16 @@
+---
+- name: add group vnc
+  group:
+    name: vnc
+    system: yes
+    state: present
+
+- name: Add the user vnc
+  user:
+    name: vnc
+    system: yes
+    shell: /bin/false
+    groups: vnc
+    create_home: yes
+    home: /var/lib/vnc
+    state: present
--- a/roles/shell/tasks/users/warcall22.yml
+++ b/roles/shell/tasks/users/warcall22.yml
@ -1,15 +0,0 @@
---
- name: Setting up warcall22
-  user:
-    name: warcall22
-    groups: fortitude, tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: no
-    home: /home/warcall22
- authorized_key:
-    user: warcall22
-    state: present
-    key: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEAhHxxbH06eyVcfLrTS+Y3EU56E6g5dnBbySIJpdX8NvfZ1RgVK035B7b344iYu1Om7IJqCYFprhnFUxDsYOYYezD9PF9gAd4DYSERWz/jgoGE2sPryDOUPoXtRUDch8oLh3ZJsBcvLE/cmXWIwq3llL03VrrJP8i7CIHOV3NElCMVjpCcgZ4X3iOyDXxivFgWnBYthSrUAkq+dpnl7o/wlBRKpOaXOfyIjhjh/NgDkUH8LjliYK9Szcqute7T/0UZ1sD3JAIzyrshxVu0gaJ7O9aN9DkSQ4eBZSDB7PLEEk+HfP1eNzPul0G601AoQXugtOcZMVXJPKtNEkRtjbl1wCcvfBPBCkwudZIoGidTcctNV69rUkqCkd13nc9GwO7tKZQAIGnLzP9/40vety2WoVOu+YV9UDSQQnYDdZdB3H5TUS3/wMkZNlWwB3FznH7GE0gnNYNAzFOHWVi2dRUxQmLGMkp9sQOGgq9rAlzV87+KPC20Sf16PO4JtjcSYAxjRPg85UinMr8A/HYU5j+iErTrOi7gyZ4aTdDkz8soAYLi9EVmoDdYMUe3ETigrXbwbZ5es/xrJdeSowV+5ngSgToAfTO6BbRk3cQaopw3+bKOZOyhuuDlKpnM1xOL40DHvwALgSrWEKy379MXd2NZXkV9bABMDuOg51O11LAV/k0= fnceo"
--- a/roles/shell/tasks/users/zszoke.yml
+++ b/roles/shell/tasks/users/zszoke.yml
@ -0,0 +1,15 @@
+---
+- name: Setting up zszoke
+  user:
+    name: zszoke
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/zszoke
+- authorized_key:
+    user: zszoke
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFNBvPl7jiyKUg0AwXgxGoSf8PLnIJ1YMS7k2h5cdNb2NQM54TDmye8xI1SKW4zvzATPPSeMM584jrb38cYLx3joZvzaOOnXi43mk7Spp0654SfNaoBUXs2FqJcE8Yy5B4mhdsszzYn4q5rBs02hrRZ36R5gZCvYvnSF2fME1TZxHwWVexLagGRAxXQDbtH6Be8DbHeXj75kbqQ5AbK6PYMb9/kxQRWE7mjxzw1mUY6r85VM1feRqb0h2HpVGScj3MS7kW+njfNzta/h2SRBYiKxMnTmReQpLGHBLAZ9+cVfCycN+NFP86Ea7a5rwxsiHBqh9MWNDY3MsNb31TLJTKtOYOXxXEw5KuMYiJGPVQ12uHT2XhGcwUMhjbY2BWqjo4YFQKbpGNLY1cJ3q+XjLgKt366lVMHg7i1wzS5QlKD5JAh5WEiSrWgRU/nR7PGGXDuaNkTUyG6to9mAX1+jCQ2DTRYoE1kd209b7CFbmuLJtFFb8axczamtzfnFat3+EKw75WzJrYYhMNklCbuT2IVnhe1JGpKJFc25TxnSSdtqupBEyF6znQhurm6vLr9LvYqPv3IWa5WVmYMaORvC+ljh681rleclMTubom+dOnsU8ImKv/FhhDSh5y0rlygtogTHjvOMTKRCKq4XGSUxb1jAgE24FAVDxg3H2fQbmQcw=="
--- a/roles/webserver/files/etc/apache2/mods-available/php7.3.conf
+++ b/roles/webserver/files/etc/apache2/mods-available/php7.3.conf
@ -0,0 +1,25 @@
+<FilesMatch ".+\.ph(ar|p|tml)$">
+    SetHandler application/x-httpd-php
+</FilesMatch>
+<FilesMatch ".+\.phps$">
+    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
+</FilesMatch>
+# Deny access to files without filename (e.g. '.php')
+<FilesMatch "^\.ph(ar|p|ps|tml)$">
+    Require all denied
+</FilesMatch>
+
+# Running PHP scripts in user directories is disabled by default
+# 
+# To re-enable PHP in user directories comment the following lines
+# (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it
+# prevents .htaccess files from disabling it.
+#<IfModule mod_userdir.c>
+#    <Directory /home/*/public_html>
+#        php_admin_flag engine Off
+#    </Directory>
+#</IfModule>
--- a/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf
@ -1,7 +1,7 @@
 <VirtualHost *:80>
    ServerAdmin webmaster@thunix.net 
    ServerName thunix.net
-    ServerAlias thunixme5v4rnoby.onion
+    ServerAlias thunixme5v4rnoby.onion thunix.tilde
    DocumentRoot /var/www/thunix.cf
    ErrorLog ${APACHE_LOG_DIR}/error.log
    CustomLog ${APACHE_LOG_DIR}/access.log combined
--- a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf
@ -1,6 +1,6 @@
 <VirtualHost *:80>
    ServerAdmin webmaster@thunix.net 
-    ServerName thunix.tilde.chat
+    ServerName thunix.tilde.chat thunix.tilde
    DocumentRoot /var/www/thunix.cf
    ErrorLog ${APACHE_LOG_DIR}/error.log
    CustomLog ${APACHE_LOG_DIR}/access.log combined
--- a/roles/webserver/files/etc/apache2/sites-available/wiki.thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/wiki.thunix.net.conf
@ -1,6 +1,7 @@
 <VirtualHost *:80>
    ServerAdmin webmaster@thunix.net
    ServerName wiki.thunix.net
+		ServerAlias wiki.thunix.tilde
    DocumentRoot /var/www/wiki.thunix.net
    ErrorLog ${APACHE_LOG_DIR}/error.log
    CustomLog ${APACHE_LOG_DIR}/access.log combined
--- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf
@ -1,6 +1,7 @@
 <VirtualHost *:80>
    ServerAdmin webmaster@thunix.net
    ServerName www.thunix.net
+		ServerAlias www.thunix.tilde thunix.tilde
    DocumentRoot /var/www/thunix.cf
    ErrorLog ${APACHE_LOG_DIR}/error.log
    CustomLog ${APACHE_LOG_DIR}/access.log combined
--- 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:
--- 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
@ -30,27 +30,24 @@
      - createrepo
      - dpkg-dev
      - gophernicus
-      - libapache2-mod-php7.0
      - mariadb-client
      - mariadb-server
      - php-imagick
      - 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
-      - shellinabox
+      - php
+      - php-curl
+      - php-gd
+      - php-imap
+      - php-intl
+      - php-mysql
+      - php-pspell
+      - php-recode
+      - php-sqlite3
+      - php-tidy
+      - php-xmlrpc
+      - php7.3-xsl
      - tor
      - torsocks
      - yum-utils
--- a/roles/webserver/tasks/users.yml
+++ b/roles/webserver/tasks/users.yml
@ -4,24 +4,6 @@
    name: sudo
    state: present

- user:
-    name: amcclure
-    groups: sudo
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/amcclure
- authorized_key:
-    user: amcclure
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsGEzYmXXveq7aGosnJR0I3h9zwPZTOr+ytnOiwPam2KhR9GBzZsAGxtpwXXdvIUtvGFV0tlDWZ851wAYvJsRzwOu7t4OgrtrxkC/qkZ+p9FyjQ4kBX3oSKWJ08J0K59uv3GrNVrVOzyqQ6aGb8TFgCnLN9C9ElWmdmyrZ3evbiraCov9HM8EpxCJN68nPz/ugJvIL6xZe+9+uGRzBrMrtbTPxTFi5SLHg1itPGFVRFJr8ZjOZ4temoZ9IKOi/EYP+FUPk+Xbg+6iaOpS0wlq2eQ+DpMFpsP+kHHiY7X1Ln4pMA4C8ewfqnFi6kI8VJtDFmuZgXlaV/Uq5T54zRzZt amcclure@tilde"
- authorized_key:
-    user: amcclure
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDhdNCqJ2+kTVRdf9R2g4Uv9TKuQzY4LbtJm5V1dx7uMfNI8HGHOa8gFopAaId8S9SY5WoIP4R0y+avZQzKRAVcqJNiKrKQDb5juLSWgL51CrOgZd6Y/nCUnvgmpAEUBzlxIBSDmiozDF4R6fk+8MqXsT8/HOaQgXX52v4qWBY9XWSOFwCeukywpnENvNm+H3vJhHddIYtcONWJB5m6msrBRo5NR7uo5RVt5GJpUpXfdI2IHLV4YZavLWiT/yBbBvxCODKWkNNXr9jBZ5RHPnqYcABoAKJ6hMaNzuJfAa9AvlV5aRDhRenOiS2/EQhC4rxPMHmnfn4TYng7vQRbVTvnGeLNGtsLqRDWuNQEmLYUZ8Q4JZfoSzZVmSyy2NeLvJRYxQRh7NTZlzoDkY+JBURINPcfVduVT2DD0buFSdhIq7/jreV1QZuSpOa5ABgvhTOf9bCIPaqbJ/zK7m+rqIPUhvrNZGgC7xkUpzdfl67W3xh+RyEIPdJX98dYZ9bZFFYvntW+plHizBBs+s7kGTV7BKm4rJ2oQfTby1M3++tSTZi/6QAkcOEb3VJ5n0rQiM+FMLuHfP2dPXh3AIVKYAiwZjdrJ3174g8JjSTXt3jJm6I1KW89oG2AcBbI/N3bgIVXcU+IRx846+zU7iZ49YtJK61Ml7u9aVQJDABQEMg6OQ== amcclure@triton"
-
 - user:
    name: ubergeek
    groups: sudo