Added python-certbot-apache

2018-12-22 19:28:28 -05:00
67 changed files with 157 additions and 942 deletions
--- a/3
+++ b/3
@ -1,8 +1,9 @@
 [common]
 phoenix.thunix.cf
+summit.thunix.cf

 [shell]
 phoenix.thunix.cf

 [webserver]
-phoenix.thunix.cf
+summit.thunix.cf
--- a/roles/common/files/ansible-pull
+++ b/roles/common/files/ansible-pull
@ -1,4 +1,4 @@
 #!/bin/bash
 cd /var/thunix/ansible
 git pull
-ansible-playbook -i ./hosts site.yml -u root 
+ansible-playbook -i ./hosts site.yml -u root --limit `hostname -f`
--- a/roles/common/files/motd
+++ b/roles/common/files/motd
@ -5,24 +5,7 @@
    |  |     |  |  |  | |  `--'  | |  |\   | |  |  /  .  \  
    |__|     |__|  |__|  \______/  |__| \__| |__| /__/ \__\

-                                               EST DEC 2018
-----------------------------------------------------------
+                                                EST DEC 2018
 brought to you by:
-     amcclure
-     ubergeek
-----------------------------------------------------------
-For system document type 'man thunix'.
-----------------------------------------------------------
-Available commands:
-* chat - Jump into thunix chat
-* man thunix - view the Thunix help file
-----------------------------------------------------------
-To modify the thunix.cf website, propose a PR here:
-https://tildegit.org/thunix/main_site
-
-To modify the system config, propose a PR here:
-https://tildegit.org/thunix/ansible
-----------------------------------------------------------
-Enjoy your stay!
-*** END OF LINE.
-
+     Ubergeek
+     amcclure 
--- a/roles/common/files/sshd_config
+++ b/roles/common/files/sshd_config
@ -10,8 +10,7 @@
 # possible, but leave them commented.  Uncommented options override the
 # default value.

-Port 22
-Port 2222
+#Port 22
 #AddressFamily any
 #ListenAddress 0.0.0.0
 #ListenAddress ::
--- a/roles/common/tasks/packages.yml
+++ b/roles/common/tasks/packages.yml
@ -12,12 +12,8 @@
      - python
      - man
      - python-pip
-      - letsencrypt
-      - python-certbot-apache
-      - apt-transport-https
-      - cron
      
 # Install ansible python package, because it's the latest
 - name: Install ansible
  pip:
-    name: ansible
+    name: ansible
--- a/roles/common/tasks/users.yml
+++ b/roles/common/tasks/users.yml
@ -1,8 +1,8 @@
 # This creates our users on the system
 ---
-#- group:
-#    name: sudo
-#    state: present
+- group:
+    name: sudo
+    state: present

 - name: Allow 'sudo' group to have passwordless sudo
  lineinfile:
--- a/roles/shell/files/chat
+++ b/roles/shell/files/chat
@ -1,3 +0,0 @@
-#!/bin/bash
-
-weechat-curses -r "/set irc.look.temporary_servers on; /connect irc://`whoami`@irc.tilde.chat:6697/#thunix -ssl"
--- a/roles/shell/tasks/apache2-mods.yml
+++ b/roles/shell/tasks/apache2-mods.yml
@ -1,14 +0,0 @@
-# Enable or disable apache2 mods
---
- name: userdir
-  apache2_module:
-    name: userdir
-    state: present
- name: ssl
-  apache2_module:
-    name: ssl
-    state: present
- name: php7.0
-  apache2_module:
-    name: php7.0
-    state: present
--- a/roles/shell/tasks/main.yml
+++ b/roles/shell/tasks/main.yml
@ -3,4 +3,3 @@

 - include: packages.yml
 - include: users.yml
- include: apache2-mods.yml
--- a/roles/shell/tasks/packages.yml
+++ b/roles/shell/tasks/packages.yml
@ -1,12 +1,5 @@
 # Install our baseline packages for all machines, irrespective of what role they might have
 ---
- name: Add weechat repo
-  apt_repository: 
-    repo: 'deb https://weechat.org/debian stretch main' 
-    state: present
-    filename: weechat
-    update_cache: yes
-
 - name: Install baseline packages
  apt: 
    name: "{{ packages }}"
@ -14,100 +7,18 @@
    update_cache: yes
  vars:
    packages:
-      - alpine
-      - bsdgames
-      - build-essential
-      - byobu
-      - cowsay
-      - eggdrop
-      - elinks
-      - emacs
-      - fish
-      - htop
-      - libapache2-mod-php7.0
-      - libsdl1.2-dev
-      - libssl-dev
-      - lynx
-      - make
-      - mosh
-      - mutt
-      - openssl
-      - pandoc
-      - 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
-      - python
-      - python-certbot-apache
-      - python-pip
-      - stow
-      - tcl
-      - tcl-dev
-      - tcl-tls
-      - tcl8.6
-      - tcllib
-      - tcltls
-      - tdom
      - vim
-      - w3m-img
+      - alpine
      - weechat
-      - znc
-      - znc-dev
-      - znc-perl
-      - znc-python
-      - znc-tcl
-      - zsh
-      - python-twisted
-      - python3-twisted
-      - openbsd-inetd
-      - talk
-      - talkd
-      - finger
-      - fingerd
-      - analog
-      - libconvert-binhex-perl
-      - libmime-tools-perl
-      - lftp
-      - irssi
-      - gopher
-      - fortune
-      - mono-devel
-      - mono-complete
-      - mono-dbg
-      - ca-certificates-mono
-      - mono-xsp4
-      - mono-apache-server
-      - vrms
-      - telnet
-      - neofetch
-      - libncurses5-dev
-
-#Install python packages, when it's the latest      
- name: Install pip packages
-  pip: 
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-       - rtv
-       - toot
-        
- name: Install locally created bins
-  copy:
-    src: ../files/chat
-    dest: /usr/local/bin
-    owner: root
-    group: root
-    mode: 0755
+      - mutt
+      - python
+      - rtv
+      - lynx
+      - w3m-img
+      - python-pip
+      - cowsay
+      - byobu
+      - bsdgames
+      - emacs
+      - elinks
+      - pandoc
--- a/roles/shell/tasks/users.yml
+++ b/roles/shell/tasks/users.yml
@ -1,4 +1,4 @@
-
+# This creates our users on the system
 ---
 - group:
    name: tilde
@ -9,36 +9,5 @@
    state: present

 - include: users/amcclure.yml
- include: users/ben.yml
 - include: users/ubergeek.yml
 - include: users/naglfar.yml
- include: users/anton.yml
- include: users/fosslinux.yml
- include: users/slip.yml
- include: users/parik.yml
- include: users/quetzalcoatl.yml
- include: users/redhat.yml
- include: users/gokce.yml
- include: users/r.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/freuddy.yml
- include: users/ringo.yml
- include: users/hexhaxtron.yml
- include: users/smtpsupplicant.yml
- include: users/orliesaurus.yml
- include: users/gooly.yml
- include: users/diabla.yml
- include: users/ml.yml
- include: users/usernameak.yml
- include: users/user.yml
- include: users/angelok.yml
- include: users/johnc.yml
- include: users/k4j.yml
- include: users/ultima.yml
- include: users/ragnarok.yml
--- a/roles/shell/tasks/users/amcclure.yml
+++ b/roles/shell/tasks/users/amcclure.yml
@ -16,11 +16,3 @@
    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"
- authorized_key:
-    user: amcclure
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXMHswE3kzEpqFpPtbDNUW7oIECL7ZEyKe3mjsHl35OGI0HtOJUiTogk3ebDipkA/kYbVvzrWjztO8mMR0FctBKmaV0g6oQjnW3eIF6w5xy5B5uleNvLfI6pT9Wu+aUld7GwubgCEexlbOKUDg23krMh9nzP8l4XXcw3+Zai+lUA4rutNCx1CuoKFbc+EEYNLxp7nobib7lCkHSLvjmLaVTQwOCp6DF9qxr8NqfOPFErjEJLozTtJPv1redeC7V5gwrX1/u6Mo3EgAwyRTviOsOMTOkuCZzv2Y0k4VwhO+awgXOJVOJ+fdA5yR0dHV7JtZSXVvDpqVgQUEmLu0fx7L amcclure@summit"
- authorized_key:
-    user: amcclure
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1fqmb/fYyFpG5sr8o9NY3/FP3mLhhgw3gDOFtN/6XB+BPN+jSiGrvdDke6lOJM/AVZxj8W5+Xzsfj+DZYnma/MvHnfQewTmlbsLTAjdh5iWLO6+VNt33tDbhcJzMFiePqRQKvvy2oWGRA3mgZOfwsgEoxnE8uuP6ludGPcWSrIMR6i9TZ3BIeO6WPOfbuE7WdwW78/lXvZ6rRcdy/p/5GwTq7J9LYuPEZAscrlhekwHxMMyyBEpAIbT1OW4Gzvygy7UrxLEHBPbbGJkXzsTBRb8cMa5KIqD15x8Ux9+bX5UmQaIATIeNTPym0S2OI/abAqy1MRDpUZa+QD+JLUddHppFm8cxUYmXli66vG0Orybk2p5dAHcS4ZWGXULQeTX2JZjxEVTZq6jkjsoirlf08DuZA9pOEruj4IrD4mFU6ljn0L3meeZmWotT2enpJUuZq8xSU1OxWyoc9bKbrTVhRKc4J/Hmsq+6/2Kyk9wR/wbwdeQVx5n42WRKfMrIcPf5koObB5XKdAV0/Axr7F+PytrL5tS/YFeKt5xB+NjgHtUq4ocXz+2pBenrykLXcbIhuCvV+lQ4m19vOKCiv1hf2JIN1ixseT1ruDr72i+eNt9raAC1mTN8c2pRniTDp/d6Vh9jJzNeAVtXy+dO7BHuUlOrftZYSrOoGxHJI0nmbzQ== anton@DESKTOP-IPHIEL2"
--- a/roles/shell/tasks/users/angelok.yml
+++ b/roles/shell/tasks/users/angelok.yml
@ -1,15 +0,0 @@
---
- name: Setting up angelok
-  user:
-    name: angelok
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/angelok
-  authorized_key:
-    user: user
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAm7hcvV4kpjt/pXXbm4Mdzdn3yWMdo/zS0HVJ81O0aqW2bbPzl01eUCjwQsl+x+AgXpGioMj8S/eGXWuzTSj93TbpUL5iEgun2TMOTak9524AEJ8thJiB31NBUe9fg1TdSovH3Cek7H8YI/Cqt5s7i6bIslOa2AiDmy1kaPDnP8HCR0+ri4JAKZsqUiWEMsMdB6fHK6LQ1LfE/w33+wrmegmyCSo0BjUqULnUPgLbvJao1LL4QWD10O64qokIMBsbJ27acBPCHvfIH3/rZ4w8eQCcQk1k19h32p3XukoPnqr/fVBSZPGFboJwU60SEa8qmOxbQnynx8UZ9KhwbHRHaQ=="
--- a/roles/shell/tasks/users/anton.yml
+++ b/roles/shell/tasks/users/anton.yml
@ -1,19 +0,0 @@
---
- name: Setting up anton
-  user:
-    name: anton
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/anton
- authorized_key:
-    user: anton
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsGEzYmXXveq7aGosnJR0I3h9zwPZTOr+ytnOiwPam2KhR9GBzZsAGxtpwXXdvIUtvGFV0tlDWZ851wAYvJsRzwOu7t4OgrtrxkC/qkZ+p9FyjQ4kBX3oSKWJ08J0K59uv3GrNVrVOzyqQ6aGb8TFgCnLN9C9ElWmdmyrZ3evbiraCov9HM8EpxCJN68nPz/ugJvIL6xZe+9+uGRzBrMrtbTPxTFi5SLHg1itPGFVRFJr8ZjOZ4temoZ9IKOi/EYP+FUPk+Xbg+6iaOpS0wlq2eQ+DpMFpsP+kHHiY7X1Ln4pMA4C8ewfqnFi6kI8VJtDFmuZgXlaV/Uq5T54zRzZt amcclure@tilde"
- authorized_key:
-    user: anton
-    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"
--- a/roles/shell/tasks/users/ben.yml
+++ b/roles/shell/tasks/users/ben.yml
@ -1,17 +0,0 @@
---
- name: Setting up ben 
-  user:
-    name: ben
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /usr/bin/fish
-    system: no
-    createhome: yes
-    home: /home/ben
-
-  authorized_key:
-    user: ben
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC0Sf4AJXVn1CKWLPTXoV+bi3LNTGrGDPjWNGnJsIC11frQxDH1D4MM72WBTTERjT2ZpV48sZaPrmeQj960n7RxQAwoE0sDBMO4aKs3TXtaAY+RJarVSRPP3beo6ELONYRvdymnNPOxInWAzsPPjunZ0ufQDUt6Iyy+hTb7FsNgq4A736CxMb4oGSP/AT2Yfb0jUX0vtCxvgQC2T0oYrj8OInv8Qu0/0I0YQErZlkUO92b47B39hMxAIeTX2+0M0g8M5nJAc05gK6eoq27amysXsSm8aM/5ikY1Z4mabfAFtXzxsdFNzQ2TYCqbEnXUr5tTLyjfGYkSd97pbJtaaDBC+NAfX5m8QmrgG/5Ad9dlQH6g5JLng7yeRJYfzTlVW2gvmMnrAplHjCEIwCO0LA4zotzs6XkVrxQDmj2VGDdyFu4Z8fv9Ruf0lCE8PG03TnX7yJiE9RtT6KX3m+12xr71rdfVONRuZVkQlPlGKllGLQ7ZM5QJ2aVPDI1s2ZHFF9bm8lzg8u49KEmAJZpZPm+wc1b43inuiN/ftcl7oe1ZIxilUmJXaG74xbhfLSZa+S93WryhZ9cjoSy9p3q0QmZZh2ePSNyc6R3xJQnPjDozpJ0D3CRVeGJomGHS2E8wrHtWs5L2q0A3CjlVaducD1M2MgnQNEDmiKVob1utOKwrLw== openpgp:0x2206A906"
-
--- a/roles/shell/tasks/users/brendantcc.yml
+++ b/roles/shell/tasks/users/brendantcc.yml
@ -1,15 +0,0 @@
---
- name: Setting up brendantcc
-  user:
-    name: brendantcc
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/brendantcc
-  authorized_key:
-    user: brendantcc
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwZ5nnwTjkAE4F2Fg6NiL6SI5BsPXipiVhmqyPFMqTAGJ6SJ7wbROCpRHC0yBVYTRRNwMy3mvPXApXF3Xp8XyDPxeqe+MRbyBPlvYHXaY46PlfqpuVSxqexNbmjsu1Evdh6GNPKTd0nj2To4rqO+yO/B9JuotQtF+hqtz87lKiX1MEYtZzFJlPWj1N5j/pfrUtZfTQ/FwA4A+KEIN+v2RsIB2HH+mDTbDyJ1xz9/155iaYkBisixVnyZ3CoQJYdzDQkU0v7nJ0ZUlrs25LvnIHEZ0AF3z2lvGipqC1meDqvgjK21JNMRw56szVAHlT/ByKeXRzAbcSuBjKLJiD9sDh"
--- a/roles/shell/tasks/users/diabla.yml
+++ b/roles/shell/tasks/users/diabla.yml
@ -1,19 +0,0 @@
---
- name: Setting up diabla
-  user:
-    name: diabla
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/diabla
-  authorized_key:
-    user: diabla
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+wqdJ07pJeNrC4lCFvq8GujCQB7LAz0Sd2j5zXU15FEkp0Ib3BkkU7CfcOFJpMmAWxv91SeSzG041u3g0LJUZFCuhgGNGfza9frszBohbO33tA8+0hLu3qGtCax6z8DcM9JD8FsU/QsIB5Z/cHcgev9Hcn9oGxfXjO87U8EGDQNlfOajicM7CiTaKzRnQ4Tp6324cDkC2E1wJIhVObl8v5d0YK7MnmfVG9tn6SPq2GV5nQ2/PdnZuC3mm11FRwO9TnL5D8cmBMtd3Ob7vJFrIozB5YSfdVm3eqVtm7O5aBdontSmxI5ZXuF0IFlyYb6j/mr/CVHpNeCgNmtc48g/F9Z99p9JOYAPuD20JXsmte5lcxJGJydXevJ1881tuL3M+7wHHHA7g66FXezPtk5b9ZXddLowJfRZ5RcQAlfEHZ9aPUDGdcTnqM6UacvTCFjbo2PlWdonDifBG3WU7Ln2HYgJXhE+MD47NL+d3oc6zyNfbK8IqVoDTSxbUCKNYSmNK9gvF738ceX7imI2VBGlwG4AWq3nkZ+rnyHi0Wt1Sr8S3P1zqQqNOP53cdDS3/WFKG4m+NWaHDmfrkHwcNZ2l1+t1QPtiRtyhslvtR4V/Z2uxnYSKG3SK93sETnc+1Fw0L21qdYRSjFpyrjfLEas1JofUxis8kBxdfYaIoNNtww==XXXYYYZZZ"
-  authorized_key:
-    user: diabla
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDNqe69Ok4BIUf8Xx6G9eDTRvp0cm4VVGWrneyigp8HlnfPILAUQ+bKCZ5IGl3qZZ5Ks+9a5s6pkkBdFjjAhjb86DdYrnXYsb35TC6gg4k3zT1qLd0z/END2hvk+IrbJKrn7V7G3mp1W7wh9cmyvkpzEaZA+V1NRvcPeZN2bYdVI2RwpCzmkjvwEbGjupaZ7oRdVn4RctqiqOaZnLjNV9v2mxDgnwIbQs3y/qNQPksx4lTlrZf0qhWwvroi/d4McFBy9jW3gQWspF0T51wo+jcKAEGIF3h0D7/FT4r5ws8UThaCJWVxRkNjS3cjdDI5L0SJg57AFb6CE4m0oyREhezJa7inXrWNGNu3+6ylLMohjvZwg8g+WM6ofkwfIg0Bgi66BHTjFrsbnZ1yKOTjXpBOz1O/olrv/Q0iGbzJKnO0ijslgMxHvFS8hCoNeLSLM2h2S430hmFf+MmFnG+DJYvflhZ5KH8Lkd1KKM3MJU0kAY215f/ouA1mNfz4R6lQ7KKZmfguz2uHd9bdLE0yklg3TxDfIJW6J8rz4hxDFyBfe+ftanLLWgJQuPXyI+FJJuzszHgIUwVgs9hazHWlgjgw6jY5hYhKvII+RxMsXM08ysmwnp95IF9Fstzf6SvSsgNOleQwtUQu2UtZA6XD8V9yLSw0CnKP8qe5I1HfLmdmow== XXXYYYZZZ"
--- a/roles/shell/tasks/users/dragon.yml
+++ b/roles/shell/tasks/users/dragon.yml
@ -1,15 +0,0 @@
---
- name: Setting up dragon
-  user:
-    name: dragon
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/dragon
-  authorized_key:
-    user: dragon
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAiTffs6/7aX+ldaTIZEIHwa3NMJLDqQLGcR3qtyH3t8UE0QvL/alr2qoR+d8I/wn1zHUAONpSCooIOaJ+qsb/awzDPSzbkzRCjD60LSJ5cWjECdWvgeWwHKvQxbX7wr9cjh4rKgsiWBhScUZu2aTgVaazLy9TNOKpIfLVojWjR5mqw5mXeQP3xv3eCNoDByDSQ7CBaYZa+RWCXOHSbADgzjsjr3THZzNvgw+o9BljLzOrPfn8Aqh59t8dLpHZoXJIyN5cRkU8n3oFBHZznP3w304xezqcBi25NGS681GbTlz6C4rpQdKXDExykuW/Qg02D+Pwq4KVen/YIjLhoT6Caw=="
--- a/roles/shell/tasks/users/fosslinux.yml
+++ b/roles/shell/tasks/users/fosslinux.yml
@ -1,16 +0,0 @@
---
- name: Setting up fosslinux
-  user:
-    name: fosslinux
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/zsh
-    system: no
-    createhome: yes
-    home: /home/fosslinux
-
-  authorized_key:
-    user: fosslinux
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuhMOXrVmylszkbB0Sk1CCp+2+LbffnuPTpdRo7cEVBEb5d4W7ZgDEP/e4kHGwAf5LSolGtG/1tn8AUxrYp7XVf/RupgbcaJXt3K2JMgowE4q9dzTsx7sEcWwsp+KA+b8+CJTbritWVWMAvtfOPfO2bnhWxg/3ZxnkVe0DGSO9gIy+tvDjwQSM5Sc/+MlHpG4nIh4i2iyZZnQDS85wbhXNy/f9bLNFUGHxqQP3u2mFnBKFHvKLd0AMKfcW4q/RmmoTmmLkb2f6OaF/JgMGJzeKiCedE7ZAv4MhX6KvQi06XRlVmsvfyjdTR0W7v8ZOfUOAdnmtxth1EvLHnQ2N3XXp"
--- a/roles/shell/tasks/users/freuddy.yml
+++ b/roles/shell/tasks/users/freuddy.yml
@ -1,20 +0,0 @@
---
- name: Setting up freuddy
-  user:
-    name: freuddy
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/freuddy
-  authorized_key:
-    user: freuddy
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCpCzTDJIJfMkoaaq1OKp7EBAdNZd3AK1evsveBQLqqrHu3vAteA4KNgvd33/UBAdTcUcSXXpEB3sFb1Gl27Z6Aer0eOqaTWC2rgcvGdNRCcOKgmvYGaaYGYX/hHqPfCxfOF+GlZ8Ri+FJKD/O/R32TlRIrAPhVXO746uiTs1Nt+QeJS2ZP6X+RyoEkPTes8xZ+ou7UUiePvuRc/jPnodLepKs9x3mqJ5fm4SGJe8KyGXEqVBcD35B8ozGPgBbQrroOzn8eWxQ7RJLQ0f1RDIQM5Vipe/vkDPvCkN8f6ie2EvL3YL/PfaIiWIXynmb36I8edOAca7tvv+2bbOksnkUrmFBLuF/Wt6abZr1ilUs+VG0E1X5sw0/ggKnOjAYVicmkKT6uiXBcKZOkQrZKvaveYOrwvDG6bWPyw87Mf6ZOfTnEBQtDPBOpyF7hObEkB8ldd1BrL9zSis5ettMbjkDz9hdQNa453wcbt1pxyHGOy6rpfeEXBkkvJFF6HfbFcVs="
-
-  authorized_key:
-    user: freuddy
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEArG8Ri516Woa+UnkuWqU5mGnzJw2ssit4sqndrQjTGHVeb4zk1ZHfk/IerlUWelvutdgVPqGqsG+iiE/jti+ZGwl88lGhpLcyz2Dq7iSNr2G+78ziTR8VT+VuxuScezz8vsmsxxydCMpHZTy/hfmn0e9Q0lzgun4qIuuGHYzwRlT8g/EZ0VjI6MA6ZKGTC2zB/WxFcvtpGObNJzcPcgm0ercNIVM0W2w+9vAqhAD9tOgg8FTBjlzSjN4mo8P9ZIMUJllMKjT9iECTxtKnzVOtN4CNB6t01m9MxTgUuAbjlMpwIz1BPnknD1KmnaJ1MR5uuzuRfDmgkW5+DvvJWXkDhw=="
--- a/roles/shell/tasks/users/gokce.yml
+++ b/roles/shell/tasks/users/gokce.yml
@ -1,16 +0,0 @@
---
- name: Setting up gokce
-  user:
-    name: gokce
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/gokce
-
-  authorized_key:
-    user: gokce
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEApJX0iiELtDrE4XJDpchsJRapze4LbldbforR2AQubFq4zw35Z1BsczwszmxS6dnQfaJ1jluKLNaLXYpA7z4AM/3LLNOLD8m1V3IE1Cg8Yv6zE4qxEDr15CSF0T4+tJmFMFR+lvbnK5ouHfIuq81Hywgsqfzl1A9JMw9TrwF0tRA6D7YoDVTiw1fMswAUB9MoMggITsnPzy+yYUjZl4WeaK71wr4eqWGgNCVQQV4QqJ29RDXJ3KqXuqMa4XDTdi23hHriuiiX09nHCXttQF8PXnGwMH3ssHsiv5rLnRu5OQBthHFxLuxYLSBZTACOll1W+26rJW35qL8CK48HCZV3AQ== rsa-key-20181226"
--- a/roles/shell/tasks/users/gooly.yml
+++ b/roles/shell/tasks/users/gooly.yml
@ -1,15 +0,0 @@
---
- name: Setting up gooly
-  user:
-    name: gooly
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/gooly
-  authorized_key:
-    user: gooly
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSQLNqCtALiln4a8h2V7R+uhy/pGg/tq5PNpFP4YWSUneIhZFTNJUCFGm9is7xlFGRMfRkBlEf8ZgH+HI/frwnrJYQv5dE7PXlGP2yZOgRh8jmnuvoZnI6n/NxvY+ty4l07dfpUG40/LhSbZz42nVWEMJg5//3ft4diFMU/u76aQ0D5SplfKqh2QDVaHBcaRWp3dQoyGkjSU+THBnLHsEGBGRJ6HnfYmX78aHeIhfGeJ0m5y/O3eNkjVcXTOzNmYk9Ja015SnBdBhFLsPbg7KUFASQyMZMkOuCei1jwGHZV7ezeKrMee0TICYWIPm/cAVTBrhiAYOwC6IaxWjo3oe/ eran@eran-PC"
--- a/roles/shell/tasks/users/hawaii.yml
+++ b/roles/shell/tasks/users/hawaii.yml
@ -1,15 +0,0 @@
---
- name: Setting up hawaii
-  user:
-    name: hawaii
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/hawaii
-  authorized_key:
-    user: hawaii
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAyLRXYtAYkGMnZCRYDKav8MqKA6abqFJdS05Csr4qN2gE6DHxPVl+gHeXHBLYnhV2MtKqQ6LU5KUac4+Pdm71lHSNhq8kgAyr5CnXEWCpn6yx4GWFLCdAY4/ST70OvnDGwre3F0Z+Oc5RXYGJWLlH7OSWYonKrOu+x6ONc1XH3Ixzts/acEdxknPSroJQ/J7nesY14FQDNTRcrUeDjPpH54pZvYofoPoYwS6yEyRVAj86v/cyzFGGhfXonU7c2eFYKMW8lYswuN8sC1JKXh+2hgfT8ALqcpA7OXj6r00xicUX2Rn13Tmnt+yhgC2aq9dEv/KIB4drwOK57Jyw/faMOQ== rsa-key-20181231"
--- a/roles/shell/tasks/users/hexhaxtron.yml
+++ b/roles/shell/tasks/users/hexhaxtron.yml
@ -1,15 +0,0 @@
---
- name: Setting up hexhaxtron
-  user:
-    name: hexhaxtron
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/hexhaxtron
-  authorized_key:
-    user: hexhaxtron
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9r5sCqljfwyQjtgAjvOgZFifUBixk8zid+egtksqfmrA3uGmWAYKE5Xbgc1iOHbaG1wEb3sbBJkM+9zO7NjSBltapLqAU35HuaKZ4VJSAVDUubNlnE1QDmfs5ouyLAW2IADWH5wYgOObzmNOvxgHjtc75dZ/vvVI9Bu1wSE+LWCiy3ElW8jQ70QLUrAfeoI24p9DYBNqKvRRSyWaMkwgw75sMRwcNOQGPq2RdY5sDIzrlNs4KbmU1LzBaTIp3fSUc9S+Twb2ofI93VfyO0s4q3Wv4MI6soXXRNYEQWXvYnB1C5/OT06uCZ/PIDNgf+QmFIEKRo1XSlSJh4YAsXj8N hexhaxtron@archlinux"
--- a/roles/shell/tasks/users/johnc.yml
+++ b/roles/shell/tasks/users/johnc.yml
@ -1,15 +0,0 @@
---
- name: Setting up johnc
-  user:
-    name: johnc
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/johnc
-  authorized_key:
-    user: user
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAiAonHMc+x032yRREUKnXx35WAP/60213D8n7ZJPuk5wQm3HMNV7fZaMhzfGsOTUpQ09GJWEZphHPkznTrtvd+gphwo8PJIjD0nqUoQ2q6yXKMYqYz5eh9JXp0Q47cM9XHoG2qczacbwly0tn2pQJmBkavWb/tbG3S7g7+TNUc2TfOh5eDdFzkLpmqykZEn60TvWmr5mtqZ3lpJ00h559UsDJY/Lkw7lCfNXl1YoGxW070l/zlyGdOE+s3RobNZuRlP5EntFOKDMwvzwhr/pYuBaZlYwRhJ3+Rjdt0tNP8g7PxGM2y0VTeXn5as1fQMk+mGPuTNtbPxAlgG/JR4dg5w== johnc"
--- a/roles/shell/tasks/users/k4j.yml
+++ b/roles/shell/tasks/users/k4j.yml
@ -1,16 +0,0 @@
---
- name: Setting up k4j 
-  user:
-    name: k4j
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/k4j
-
-  authorized_key:
-    user: k4j
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpZZP7kYzdFelBklSFv03+gNlWGkj6BRwJ2dogBSJOGLtU9vw3iH4O40YVB1w6hDrdiaGm8CD5dsbJIGsU/UKXAbyeowXG+e/TEb53CrX8A97wvAoIOL1f06JdBtA9wF1TCDm+JFxDizC6GZ0m5gZg1pH5NfIFPfHJHzejCP+wq7HeJ9jQNFB6P5gVLQpaQFboZ3QfLxkFu4EeRoh4WXXA69lmsx1V2xFBoIVoKFYW8GlIUIpuy7pUCYIyZZRavT0OQ1CUmCob7vI5twz7upDATlLMctgEAtGWIbZGQ+GivnxIJ3TXlr41T8OMqar6cYgOGnP3ozTqgt/uqWSkS/Zr Kaj@Kajs-MacBook-Pro.local"
--- a/roles/shell/tasks/users/ml.yml
+++ b/roles/shell/tasks/users/ml.yml
@ -1,16 +0,0 @@
---
- name: Setting up ml 
-  user:
-    name: ml
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/ml
-
-  authorized_key:
-    user: ml
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvgtzXdYzlr1vO6Ew013zBKpud1FvcWAoboJaKuv0Ws2ockXlMF6HN+dH++kF+WijTjDYw6+sJ0r/ISz4hkjPU0lnMeMZK0CvTeIV0tdINzvo+ojJkT8vIJuUYZnZDVxtzzATuDlpYiNxtFHwkL0uGp6xqKgrnaju0ShnOg6Kgtptq0j2LXO9T8BH1inm0EOszsqZqZOtwgSWxwbt8CPxigfnrTG4cyRhp/GeILlDL4fMaZSpSPueh0JhABnB0L8sIjwR8mSlqc1RDDI5o949ONMj6C+1CMXuWXRtjLBPlAK2Qk7TSsTEuCLIc/55vNj2GKffgFMHa+aizF9H8Jyax"
--- a/roles/shell/tasks/users/naglfar.yml
+++ b/roles/shell/tasks/users/naglfar.yml
@ -7,8 +7,4 @@
    shell: /bin/bash
    system: no
    createhome: yes
-    home: /home/naglfar
-  authorized_key:
-    user: naglfar
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA28HgWw37LTgH4HQbtkGxDnGThWV9OX1CRNVwJUR16019owKnM9kPtdWr9br5vQ6Lm1PV/te9blH958GIl3dSJOskqRDxqphGOjNV0IFLji9slVRoiakyL/bk0+oel/1piSOqKh5O4B13QBvkcJZr7C4/epi28k0wW+c57uc5blkKd41GOHbR33pu45n4x74ObJVKtVmJ6kUVR7FMX/f0H5+1LRzv0tY4zXGIWXJseFwu+nsBFbY7Myy2v2ivUDVz+syusSGTTIs71GUKLKF5VhYoijz0O09aKTuCKTcXf1mgCU1b5yJvD0Dh2Z5bFo0yOw4Jq833oRGl+nei1I1jgw== 797F"
+    home: /home/naglafar
--- a/roles/shell/tasks/users/orliesaurus.yml
+++ b/roles/shell/tasks/users/orliesaurus.yml
@ -1,15 +0,0 @@
---
- name: Setting up orliesaurus
-  user:
-    name: orliesaurus
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/orliesaurus
-  authorized_key:
-    user: orliesaurus
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAo4kRIK2l8i0Jb7NsWkETg+xP2on/HZCA8O1JhbIYYcuwWEJg+MZ5HyQzm/pt7uXCrIKJOGi2HvZ88ZOhs59IzQ2js3inVrbL910dcdvIvsJiyh6VbjWnpS5QP320VYkBL4cqC6bcpdKfHB5X7fZM00+5a/i61Xez2tXsd6SgQ1kWg5K1crrPDf+B2Ebc+Z71hFfSfeYeoD9ccerW10XGKu36KO8oLw1+gb8rOLpPHvb/+Pcct9+ZqS4ZzdkdIkdxMxG+zgwX2f1ZrYeWoXYR2fEKm/9KuGO1dg/X2VHrS7+OhOC3eoXWsPDWNNS1lKasOykJTp+G1P2VIQOHD9CDwQ=="
--- a/roles/shell/tasks/users/panzer.yml
+++ b/roles/shell/tasks/users/panzer.yml
@ -1,15 +0,0 @@
---
- name: Setting up panzer
-  user:
-    name: panzer
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/panzer
-  authorized_key:
-    user: panzer
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAiIOM7JmQHGBkcIdX4U+eSOfImF7F+aluXVCLwzb/nUVa5zwlFWlNPRSBcpYgaamEBWHbS4UjP7dEKHRIkGyeCChVRHPoXZY5YIvWyxFrS2EpVA+xqrRRYp/pzw4248ZsVMEBb7wWpCv9IJ1NIMN4BKw7fAurqFa+WC0R1rcIIFrjfdOyEt5RB2TiOuKBaAxet0cMPK/bfPNprKILVRiCzY2LZA9m37L5KK+KPkVVw5Dyg7Fswbx1QogO/7hU6lD3oqF4RjVMbxVFGe2YG40+goUCkQaZ2BbWMWs0uWZdgg9pUIIPwU4i7K+frMdLftAKpQNTCSpWOWfGcllOaNcuEw=="
--- a/roles/shell/tasks/users/parik.yml
+++ b/roles/shell/tasks/users/parik.yml
@ -1,16 +0,0 @@
---
- name: Setting up parik
-  user:
-    name: parik
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/parik
-
-  authorized_key:
-    user: parik
-    state: present
-    key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKauuT1/UGUWg+1o27WhFMAoQGfFt3mv+hqg7SEackVm parik"
--- a/roles/shell/tasks/users/quetzalcoatl.yml
+++ b/roles/shell/tasks/users/quetzalcoatl.yml
@ -1,16 +0,0 @@
---
- name: Setting up quetzalcoatl
-  user:
-    name: quetzalcoatl
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/quetzalcoatl
-
-  authorized_key:
-    user: quetzalcoatl
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJ0QUlB+fek7OW6DCk/dXL4a0Bgrt06+LhIqWKymYMl8mnWqnwIfKJNzNxMNzawLrcVIBppKzgIzFJzGCjMZ2fr6YQFAXAP1lkZlcnjxgasn9KoAj2HcJ06kypwtUSqe+ubEzoim7sBQPUqqBf1K90SvvOEQt3PWIJrlYqGG+9vDy6o52GxMEYw4M7wc+2VzuXybYtCBoFLzcNUC0D8RpkW4M3ZGnEKa11WRycOR+8ChNuZAPRe/o9YPL/7BcCyz9WLa9AAoO8Sr83KbUzDFfGWieuYIRFJHCkQHscemEc/kbqi/3v56Ww35lzaEH+bJcr3njqwi+YzCjdHcuLe6L6uCiI9+L6jB1+Mjt4BoWDeddHm4uhBwPIwKREX6ARNlx3QFTAIrveWZtaJu9/Rb7OfrqOuRa4M5OKvNQW6hRWVutlqvRxX3qrJRKSGPsk6tjH8Pw2Pp7Q30lYfwjH1mSJNyZDoH+MO/WsvAfcMVfE/OeqhLoy2D1BqFhW+2OFv6sfeykUYpacbt0JHYA3ZZ/C8ZeLCNo0dvR1nIMIrk3s+uedqXslo1/JKsoBX+fsklt3sb431xyhsqpoepd47FGweZKHcfgqY1WJs/AzCugM9jZHP9Xd8XdqKcUP6n5G00HTJ2VdfMlM5tA1c3bWYpuUtkU+z2XZpxKO4HXZnUXkgw== sdan@mail.com"
--- a/roles/shell/tasks/users/r.yml
+++ b/roles/shell/tasks/users/r.yml
@ -1,20 +0,0 @@
---
- name: Setting up r
-  user:
-    name: r
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/r
-
-  authorized_key:
-    user: r
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAmzaAVzYekUlrMwZHVdb/TbgJWy6YsxWAdhDHYK06rlgqK2DqolsReUH//DZp/ORPWgPo4oUxH9blwarT9sDTqwlgACI8osAmsWvLtWm0i/h4chcWRlanMOlZiRO2uy/extvS6qaEJmOkBVot9hp+rRFhf331YwgVCj/5H6NUyxG1EFhC5e6B+qpwQ5w7ejY4Bt2NSNC61UXgmH9q+2dxr5+odUE6lxtSN26xbTRY2UR14b8MBQKbc8+r54FbpF7zzFJac5DiWBYBLp5CPKCnDmOqynkYwWaSkqDb4j9NKH4vOsahyOPVFyNis9AAMYO4ex2eFpCm+zJzgRpd3HsY9w=="
-  authorized_key:
-    user: r
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAmzaAVzYekUlrMwZHVdb/TbgJWy6YsxWAdhDHYK06rlgqK2DqolsReUH//DZp/ORPWgPo4oUxH9blwarT9sDTqwlgACI8osAmsWvLtWm0i/h4chcWRlanMOlZiRO2uy/extvS6qaEJmOkBVot9hp+rRFhf331YwgVCj/5H6NUyxG1EFhC5e6B+qpwQ5w7ejY4Bt2NSNC61UXgmH9q+2dxr5+odUE6lxtSN26xbTRY2UR14b8MBQKbc8+r54FbpF7zzFJac5DiWBYBLp5CPKCnDmOqynkYwWaSkqDb4j9NKH4vOsahyOPVFyNis9AAMYO4ex2eFpCm+zJzgRpd3HsY9w=="
--- a/roles/shell/tasks/users/ragnarok.yml
+++ b/roles/shell/tasks/users/ragnarok.yml
@ -1,16 +0,0 @@
---
- name: Setting up ragnarok
-  user:
-    name: ragnarok
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/ragnarok
-
-  authorized_key:
-    user: ragnarok
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAoDVOXgA99sSsgBuHemHZXICuWX1rq01sQasy0XHPZxy9OgcRgSeA3j4IcyyLa9L1vnItOQtspbXyeyJUjwoG8p1Ui54PiIjcSWL88MLCmJ1+9FYqYexSTGTrBfl+yvjnJzV4414VdMRmGPHhM7Jrpb70P4hyycGKsf249TUCS4wtOlX9UMMySq7VscIpUpYUjLxACGDKKv9Ek9tPq+LZC3e5SsiOF9vNa0hdow5wGQkI6lMj2zaCf8ecCkX0L+wLQN7nT+w75o1ah7QfECxVVsMDNbA/6btYEGrWpKGJz+2TQC6CvDPYPGPi9zQFG2Whip/uf/vLq5zUJjCFEDS16w== rsa-key-20190119"
--- a/roles/shell/tasks/users/redhat.yml
+++ b/roles/shell/tasks/users/redhat.yml
@ -1,16 +0,0 @@
---
- name: Setting up redhat
-  user:
-    name: redhat
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/redhat
-
-  authorized_key:
-    user: redhat
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2J1CJ8/6LDq83gahh4WwoSldjE91fpwh2DX6vlCqNV5uiM8NpCNWRyeUZV3zkG04XtyuE6yNsGvqpGFAbK47TiOAXv9bC2n2nt+WXZ8nVtfHr0A2ajXP/6E/v++lcX34x2kw1lFeWzqXCpaPlJojfUYAe/YKoAns9nVcMyIgeaiNyWouf4dpCo9p+uH2mjpTuG+Ty87DEvJT1FiyKgxtqXZim6M79vgIerCjBPw+neIGT3Q7OHZzfBcO0IpGVvnlevEpYQx6RjjMAUle3I5WkZrNesb5zSpYbmxrnAxmeWcVVxKQ2HP5Ousa62oTuJ2c3L6U6OwvXzJZLyx50G7rtQ== root"
--- a/roles/shell/tasks/users/ringo.yml
+++ b/roles/shell/tasks/users/ringo.yml
@ -1,15 +0,0 @@
---
- name: Setting up ringo
-  user:
-    name: ringo
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/ringo
-  authorized_key:
-    user: ringo
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwIvS85XracOn8mk0XL7FBMpYO1tE3SfMbx1WvlGDOxaEk96TZdxJ070HaxRodTk58RsXfeOh3N0vWUUhO6w+wx2MFwLwZWCRYsO3R0HaBunbZ9moadU5v6P4yRBvszyxYl2Lx85FUkfKh0+Yzv4vtbyLQ1d2JQcWLABF56KIK6d7ep5rt2L7PI8mYDdMcqkPy60EGKIhBUqj0CBUdVZyfvV0SAjl6dirvFpdRbZokwqCofpOMoMZx1U8PQSuf37TWzN3lHaPqxhq8Ky0GkulASLS/SdLRDYjAlgEspxqLUYmJKy0QytJlqFDUe2QhL2KSY8lkzCgAkpm/Ib2tsrJ1"
--- a/roles/shell/tasks/users/slip.yml
+++ b/roles/shell/tasks/users/slip.yml
@ -1,16 +0,0 @@
---
- name: Setting up slip 
-  user:
-    name: slip
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/slip
-
-  authorized_key:
-    user: slip
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDxJLB1+h8N2FBTLkPdumTLFej01B7k59ejv5NQ2REOGtZrEdaCT/Qb0YSyhiKL8BL4Auwl1FLWiOkazTO8JdD84TaBCuijOpo9v5UPMA9M46F5A1hfkOSUw2UzfcXOuygZIJSPylxDnevcDI/dG0IWJxdbDMrCiX7+E1yapIHHsAaioajeAUgnV5V+mJ30+YKynVIqaW8odZNAGNwIshZptdYLgYht28EJ1p0BP0LN5wk9c/JZsR0Y9npbkk6K4l3TiIrlCMQg8FhmTvbKA4adhhokQ8XQV2/EmqVRd/ip/ibkN0U8UNxEppRCVuMe7Pu2rp0m861FLfXV9hfx+I9B chrono@localhost"
--- a/roles/shell/tasks/users/smtpsupplicant.yml
+++ b/roles/shell/tasks/users/smtpsupplicant.yml
@ -1,18 +0,0 @@
---
- user:
-    name: smtpsupplicant
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/smtpsupplicant
- authorized_key:
-    user: smtpsupplicant
-    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"
- authorized_key:
-    user: smtpsupplicant
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXMHswE3kzEpqFpPtbDNUW7oIECL7ZEyKe3mjsHl35OGI0HtOJUiTogk3ebDipkA/kYbVvzrWjztO8mMR0FctBKmaV0g6oQjnW3eIF6w5xy5B5uleNvLfI6pT9Wu+aUld7GwubgCEexlbOKUDg23krMh9nzP8l4XXcw3+Zai+lUA4rutNCx1CuoKFbc+EEYNLxp7nobib7lCkHSLvjmLaVTQwOCp6DF9qxr8NqfOPFErjEJLozTtJPv1redeC7V5gwrX1/u6Mo3EgAwyRTviOsOMTOkuCZzv2Y0k4VwhO+awgXOJVOJ+fdA5yR0dHV7JtZSXVvDpqVgQUEmLu0fx7L amcclure@summit"
--- a/roles/shell/tasks/users/spanmer.yml
+++ b/roles/shell/tasks/users/spanmer.yml
@ -1,15 +0,0 @@
---
- name: Setting up spanmer
-  user:
-    name: spanmer
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/spanmer
-  authorized_key:
-    user: spanmer
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOt6C0btvDjOaa/yW8Z15GJwWzLzCiheaSdEfAaHD4wm0a7Fyaw36z5aX9o3kmm+1BbvqccYQA+xRwTGUF5fOkT7niKg0HGxfUTYeyPEp2wMnBWjJ+uUiaZAOv23nWzXtQ+pbKChsT8dpDX8H5mKEjRB4vIBEOROgTVPo1A95XTV2rQAujgbatzT6qNTBbysd9vJO+4C0G+nwHeY9fhDLGYJnwYnh0dOyj69uo8x2DauTXSyxDnQ1cSoGalIcvDFMN+b3hsQvBakPSbHMIPN1r7xxWKdNVQ5Mc5OGQi7CIntYKM9RNqcZK5Zc/zDwgpHnX00FXDhzVVDI45h2misAP leandro@canaima-educativo"
--- a/roles/shell/tasks/users/trip.yml
+++ b/roles/shell/tasks/users/trip.yml
@ -1,19 +0,0 @@
---
- name: Setting up trip
-  user:
-    name: trip
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/trip
-  authorized_key:
-    user: trip
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAz7N8cOx99cFFfTHdfJcATlysq7RCYQFPz8rYZ07yItU1m7D48gtf+97xJ1sA5o3TZb/2sxUcHwJnOGaeNKcScS3Qs1AccEo/y9Ptkrpqe8MKrBmpXp8H0kpPrWSRbX9d2W5vpRd1V96PqBiF6Zk19J/oyBeVYLuubJdQByzaQxGbkm7SF2Sl/AoiW36hI3g2LcFg9rc6YzUHjfakxy0Va8N7O2NjaSF/RF2f++lzPR3MKPtSgDHdXGqK3skOUp8uZ94y/3JDqrIlXM4CCHyvX2xA9oXTmAyRzlSnicLBl45+c4WDB6IqZf2NrMgNNUxynXBrnbyEaEaQKB/AvPmFsQ== rsa-key-20181230"
-  authorized_key:
-    user: trip
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAhPqCtEnSjhPRRaBf3DERlaFAaCpnEo0Lw03e2GmRE4gA92b2FbEf2lAML5uhQM7n1N1eylW0XnoA3g2rNk4hyamO0y8zeFrUMyDFlv5NXOQeWaXYyO+f5mkwVOx/2iQ5iCziH/d6v5fjv6LfhzFiVvLOPxU4pE+U92NqrKE5C+Xn+miJlO8rARvUERkh+jAs9VKR5EWhRTn80Ymc7R1GMQ4P4wxWBTmxxDbqOb2d+nKzA0p//un8hLPbZDtfpp2NOjtHgysRbe6gWPOTgGSkzVsx/zB0kM78yoBuEUKTR/Or1TCWQLG6Rp1GdGS90i2mAzmo8v7UImdh3dWKpYzsjw=="
--- a/roles/shell/tasks/users/ubergeek.yml
+++ b/roles/shell/tasks/users/ubergeek.yml
@ -20,9 +20,4 @@
    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdgDD3UMyI9NdtVGuuDS1Rqfw6YoJsctAhWgGP+0w6MX5Od0B3km6C/BaMe/ZY7vA861wjoeHFdZ69nOYsdDqysCLxZCAfGBjzYM2mS4UiuV3tnZA7C/Zd+dGUfuA64iQ1SJ3FcehGezgI9zJU2JSWfhzHO2gx7fdZ9lhCEDU3qkiXy6HFzd+B0+tlEXBSkUk4g47ZLuaKxPrqeug5xGLwjlMjTSYSyhODdjvYQNkaD4ynyggdq21T0CWA5abH4nol+NPy5HChYH7wkA0qQ23GeUrUfdWmzZxua6SBVEGC0cFiLLt0ZPCf2foob7Nse6W3ISy85uBKO4QNO5Nwl+zz ubergeek@yourtilde.com"
 - authorized_key:
    user: ubergeek
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWBuCQwCmSfgH7FSI1smAex7uDY1zUNSYets5OmLrHNgMi3daCv6TngwQCjdb3LDkIRsCAbz1z3vGaeycrNLQMLCcxTRXRQRWftJ8sVKXgJicxb13mzYM+2QwtYNIEc7lCECV7++EuiGEYqk/oBp+j3j29lhqg76SDLb4C1yvGCZOT0R6IBIXf8DQ7qqQmYiEIdCdfRkwEB4euNuyW0w9Mr/jg6xpBB5H0wDJo6zOTvj04MfQ4Zk58ZMoFu9mPHaWzrm7Q1RaeKmghGRzNJUp6o5lle0Q2pgvzbuB07/utxloBHqwyQn8wUjdczUvejOBxwi4aCBfD5ba5VZGhQSod"
- authorized_key:
-    user: ubergeek
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHC99QzEk4P0XD28+5rHBoaeKVURy170Df3qT4IWSwm8bpj1GySCEYXdcFPB1z/U9OZi5k9UQA2CUwl6RJxkHukIvrsx78C36dWoOz4X3Hw1G4bUthRspdyHZBnlasDe/rJPHZmfJNTvrGs8cZu9PqaN77+ceMomfG7ESemuVZeimhiq/FXfiqfAlH6nNJaZ/b53MQtMOUrcFt2qnEzQ+L+5OUc14pRZj9BpKFtLFX6zkAvNb2l+iQ+enzUPfyikQun8E+C3wsOZlkmMBjXCO27iJkWL0EM1yC3q2ZEPO7cyf2Yhf7y4jt90HeY4VLbC9ObeNeyvOgrpxng9elI1lZ"
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWBuCQwCmSfgH7FSI1smAex7uDY1zUNSYets5OmLrHNgMi3daCv6TngwQCjdb3LDkIRsCAbz1z3vGaeycrNLQMLCcxTRXRQRWftJ8sVKXgJicxb13mzYM+2QwtYNIEc7lCECV7++EuiGEYqk/oBp+j3j29lhqg76SDLb4C1yvGCZOT0R6IBIXf8DQ7qqQmYiEIdCdfRkwEB4euNuyW0w9Mr/jg6xpBB5H0wDJo6zOTvj04MfQ4Zk58ZMoFu9mPHaWzrm7Q1RaeKmghGRzNJUp6o5lle0Q2pgvzbuB07/utxloBHqwyQn8wUjdczUvejOBxwi4aCBfD5ba5VZGhQSod"
--- a/roles/shell/tasks/users/ultima.yml
+++ b/roles/shell/tasks/users/ultima.yml
@ -1,16 +0,0 @@
---
- name: Setting up ultima
-  user:
-    name: ultima
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/ultima
-
-  authorized_key:
-    user: ultima
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAhroHlh3m2Gucx0nwfCotATwC2aTnzNKAm7nEQ5dNnobxqHKndT5ln/OCQfzJPyKFbmLWmrIWsc5x0UtzcJhnmsEhxtZspSDyttcjeZNLSxVFoC6vfQyKfF+T4LYFS9ZiUvbtJ4quuZ0WvNwa9hLjJrkc8A+67VEpJ6x0LgP7VWd7tTP1aO8d3Ei182kWwumwGHpVGOBJGGuexx4OwSnAXDNVFlKLwVS+d+dJSiEUdl+f1NoyVfcRU5TOU2l7p1cf1Bufw9Jo6c4U3eNrt7CHVeI5p1llIVVVqBBXfAQkKBo2AhugAYs3vSa6iGDAYCkXKtEzYuqykhxDFBiNLhPYdw=="
--- a/roles/shell/tasks/users/user.yml
+++ b/roles/shell/tasks/users/user.yml
@ -1,15 +0,0 @@
---
- name: Setting up user
-  user:
-    name: user
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/user
-  authorized_key:
-    user: user
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCocRAcuaiTpdaUgVyjzYgv7CLgHja43Fh0gym2g3oO3RX505HCTZMMaz1izsgbJfk0GdQkrr7PHp0Q7CNyTZi5tGPtDGhVLi6fMn7RQJIVUehSjkpzK4IciaRGzs8v6E7a6D+waZwmE2Mr5AJpfJWMGusDBBe5D6jogK89QcouCWkm2DGSjIwEkpEryFzmuR5o4dj723tXbi5wgmzGHBs2Ah9mFsP/v1NFTdueCRILdSa3go1/6R0+NCge5vN/E76go5QP9WdmRzVEj1B0DX9i0Lfd9k6Dn6sbWPtAvHsRJGgarLmHwjJWu2T3DyrKXfaO+WtbjGGDNm0VDI7gbc3d viktoras@LAPTOP-HVEBS05P"
--- a/roles/shell/tasks/users/usernameak.yml
+++ b/roles/shell/tasks/users/usernameak.yml
@ -1,16 +0,0 @@
---
- name: Setting up usernameak 
-  user:
-    name: usernameak
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/usernameak
-
-  authorized_key:
-     user: usernameak
-     state: present
-     key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4dkrIYfXlsd2esSOgv3WTfhdl0XxLdwir6sKDidYKDh2LOrAr8jg4WfbedjR9mUkEIFhz87VPLyb2G3FYZjgfaQN8ciSeFJx4m07pIMmAYFnUUaB2IFA8ay+yWt8Vlv2RuxDHykTjpsU9bHG0F/DAfE4VGO/T1na0oCbfRuoyrJJwPsBNi5XDLAs5AW/lqQ/tRRuQs9KvCQfyvWloOeVh9pMOSF4lp6T4h3KcvkUTJHWQMMf0nCv2QpjUEcb1zGd7BvXcvCJsdyFCkC4vPbQiUrWhU32EKa3LTNn17sQKPxyCXYLZtmKLZH3+gbb2lnfv+jGRuz+PVamgVuNel9RvJginlqDs72yxAjua3V0n1nLeqp4pIbUJnk34tZV6iULUQZceOKaig89qWhq58lzo9OUh6/qhIBovIblYXqZlTTXDjl1yCQtagU1cd8R9F6jVAxFIZDej1G9GMWL4SlDYAnjL2ZHQ6L/MDxlco5ivimrsDSVbCGp1IvKsFUC4HFUKufaFuH6BAheIURpBW2x1V8yS0RBwH/wqEwj5yMhC+AKy3QIout2PAydi8A72jpHf4VzE/e+zAp/YbZN08DNO/zQL4AqlOg6bNdYAPlsncnoTc+VfgOpXMv3R8xt8rBfg1GOcfENruzBwXuV0OMNbn7SVpmwN42JSUrS3mz+KJQ=="
--- a/roles/shell/tasks/users/xenialito69.yml
+++ b/roles/shell/tasks/users/xenialito69.yml
@ -1,15 +0,0 @@
---
- name: Setting up xenialito69
-  user:
-    name: xenialito69
-    groups: tilde
-    state: present
-    skeleton: /etc/skel
-    shell: /bin/bash
-    system: no
-    createhome: yes
-    home: /home/xenialito69
-  authorized_key:
-    user: xenialito69
-    state: present
-    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD2oX/fi/CD/haNaSmTBMDmDneVYjYDuueT1pzj9z6PFvyVZnPHMQZyGqsQHAWvEd5XxuM6jM3o4bdnkjmPix1r9x38vf9UEqaiSNC79jrgOvZkN0kV2l8MMb9XoranxXXpfaY5FIOcsa5/cZSsJ7+M3TEzgchnktJKQXmeXOgdSv1gXRzw0AlYoeavyg3LexJfmrPM3OTcBa9WSNxr1UdChUTJ9KPzwiNHRxN1XzCGthcsF0MJ1CLzZCAlV9/HCa86TrWtHNF9My5eLWRNlekPNspyqh510Bbyz56zRWK2WGCPuBTy7uOdo9uAhTzz6ExooJtkm4PcBNcw3HHdT78X azamora@lubuntu"
--- a/roles/webserver/files/etc/apache2/sites-available/000-default.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/000-default.conf
@ -9,7 +9,7 @@
 	#ServerName www.example.com

 	ServerAdmin amcclure@ttm.sh
-	DocumentRoot /var/www/thunix.cf
+	DocumentRoot /var/www/html

 	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 	# error, crit, alert, emerg.
--- a/roles/webserver/files/etc/apache2/sites-available/amcclure.cf.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/amcclure.cf.conf
@ -1,28 +0,0 @@
-<VirtualHost *:80>
-    ServerAdmin amcclure@ttm.sh
-    ServerName amcclure.cf
-    DocumentRoot /var/www/amcclure
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-</VirtualHost>
-
-    <IfModule mod_ssl.c>
-    <VirtualHost *:443>
-    ServerAdmin amcclure@ttm.sh
-    ServerName amcclure.cf
-    DocumentRoot /var/www/amcclure
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-    SSLCertificateFile /etc/letsencrypt/live/amcclure.cf/fullchain.pem
-    SSLCertificateKeyFile /etc/letsencrypt/live/amcclure.cf/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
-    </VirtualHost>
-    </IfModule>
--- a/roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf
@ -1,27 +0,0 @@
-<VirtualHost *:80>
-    ServerAdmin amcclure@ttm.sh
-    ServerName amcclure.tilde
-    DocumentRoot /var/www/www.amcclure.tilde
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-</VirtualHost>
-
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerAdmin amcclure@ttm.sh
-    ServerName amcclure.tilde
-    DocumentRoot /var/www/www.amcclure.tilde
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-SSLCertificateFile /home/amcclure/amcclure.tilde.crt
-SSLCertificateKeyFile /home/amcclure/amcclure.tilde.key
-</VirtualHost>
-</IfModule>
--- a/roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf
@ -1,28 +0,0 @@
-<VirtualHost *:80>
-    ServerAdmin amcclure@ttm.sh
-    ServerName amcclure.ttm.sh
-    DocumentRoot /var/www/amcclure
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-</VirtualHost>
-
-#    <IfModule mod_ssl.c>
-#    <VirtualHost *:443>
-#    ServerAdmin amcclure@ttm.sh
-#    ServerName amcclure.ttm.sh
-#    DocumentRoot /var/www/amcclure
-#    ErrorLog ${APACHE_LOG_DIR}/error.log
-#    CustomLog ${APACHE_LOG_DIR}/access.log combined
-#    <Directorymatch "^/.*/\.git/">
-#                Order deny,allow
-#                Deny from all
-#        </Directorymatch>
-#    SSLCertificateFile /etc/letsencrypt/live/amcclure.ttm.sh/fullchain.pem
-#    SSLCertificateKeyFile /etc/letsencrypt/live/amcclure.tt.sh/privkey.pem
-#    Include /etc/letsencrypt/options-ssl-apache.conf
-#    </VirtualHost>
-#    </IfModule>
--- a/roles/webserver/files/etc/apache2/sites-available/default-ssl.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/default-ssl.conf
@ -2,7 +2,7 @@
 	<VirtualHost _default_:443>
 		ServerAdmin amcclure@ttm.sh

-		DocumentRoot /var/www/thunix.cf
+		DocumentRoot /var/www/html

 		# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 		# error, crit, alert, emerg.
--- a/roles/webserver/files/etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf
@ -0,0 +1,12 @@
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+    ServerAdmin amcclure@ttm.sh
+    ServerName ftp.summit.ttm.sh
+    DocumentRoot /var/www/summit/ftp
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+SSLCertificateFile /etc/letsencrypt/live/ftp.summit.ttm.sh/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/ftp.summit.ttm.sh/privkey.pem
+Include /etc/letsencrypt/options-ssl-apache.conf
+</VirtualHost>
+</IfModule>
--- a/roles/webserver/files/etc/apache2/sites-available/ftp.summit.ttm.sh.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/ftp.summit.ttm.sh.conf
@ -0,0 +1,7 @@
+<VirtualHost *:80>
+    ServerAdmin amcclure@ttm.sh
+    ServerName ftp.summit.ttm.sh
+    DocumentRoot /var/www/summit/ftp
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
--- a/roles/webserver/files/etc/apache2/sites-available/summit-nosite.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/summit-nosite.conf
@ -0,0 +1,9 @@
+<VirtualHost *:80>
+    ServerAdmin amcclure@ttm.sh
+    ServerName server.summit.ttm.sh
+    ServerAlias *.summit.ttm.sh
+    DocumentRoot /var/www/html
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    Redirect 307 / http://www.summit.ttm.sh/
+</VirtualHost>
--- a/roles/webserver/files/etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf
@ -0,0 +1,12 @@
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+    ServerAdmin amcclure@ttm.sh
+    ServerName summit.ttm.sh
+    DocumentRoot /var/www/summit/redirect
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+SSLCertificateFile /etc/letsencrypt/live/summit.ttm.sh/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/summit.ttm.sh/privkey.pem
+Include /etc/letsencrypt/options-ssl-apache.conf
+</VirtualHost>
+</IfModule>
--- a/roles/webserver/files/etc/apache2/sites-available/summit.ttm.sh.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/summit.ttm.sh.conf
@ -0,0 +1,8 @@
+<VirtualHost *:80>
+    ServerAdmin amcclure@ttm.sh
+    ServerName summit.ttm.sh
+#    ServerAlias *.summit.ttm.sh
+    DocumentRoot /var/www/summit/redirect
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
--- a/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
@ -2,7 +2,7 @@
 <VirtualHost *:443>
    ServerAdmin amcclure@ttm.sh
    ServerName thunix.cf
-    DocumentRoot /var/www/thunix.cf
+    DocumentRoot /var/www/thunix/redirect
    ErrorLog ${APACHE_LOG_DIR}/error.log
    CustomLog ${APACHE_LOG_DIR}/access.log combined
 SSLCertificateFile /etc/letsencrypt/live/thunix.cf/fullchain.pem
--- a/roles/webserver/files/etc/apache2/sites-available/www.amcclure.cf.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/www.amcclure.cf.conf
@ -1,28 +0,0 @@
-<VirtualHost *:80>
-    ServerAdmin amcclure@ttm.sh
-    ServerName www.amcclure.cf
-    DocumentRoot /var/www/amcclure
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-</VirtualHost>
-
-    <IfModule mod_ssl.c>
-    <VirtualHost *:443>
-    ServerAdmin amcclure@ttm.sh
-    ServerName www.amcclure.cf
-    DocumentRoot /var/www/amcclure
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-    SSLCertificateFile /etc/letsencrypt/live/www.amcclure.cf/fullchain.pem
-    SSLCertificateKeyFile /etc/letsencrypt/live/www.amcclure.cf/privkey.pem
-    Include /etc/letsencrypt/options-ssl-apache.conf
-    </VirtualHost>
-    </IfModule>
--- a/roles/webserver/files/etc/apache2/sites-available/www.amcclure.tilde.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/www.amcclure.tilde.conf
@ -1,27 +0,0 @@
-<VirtualHost *:80>
-    ServerAdmin amcclure@ttm.sh
-    ServerName www.amcclure.tilde
-    DocumentRoot /var/www/www.amcclure.tilde
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-</VirtualHost>
-
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerAdmin amcclure@ttm.sh
-    ServerName www.amcclure.tilde
-    DocumentRoot /var/www/www.amcclure.tilde
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-SSLCertificateFile /home/amcclure/www.amcclure.tilde.crt
-SSLCertificateKeyFile /home/amcclure/www.amcclure.tilde.key
-</VirtualHost>
-</IfModule>
--- a/roles/webserver/files/etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf
@ -0,0 +1,13 @@
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+    ServerAdmin amcclure@ttm.sh
+    ServerName www.summit.ttm.sh
+    ServerAlias summit.ttm.sh
+    DocumentRoot /var/www/summit/www
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+SSLCertificateFile /etc/letsencrypt/live/www.summit.ttm.sh/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/www.summit.ttm.sh/privkey.pem
+Include /etc/letsencrypt/options-ssl-apache.conf
+</VirtualHost>
+</IfModule>
--- a/roles/webserver/files/etc/apache2/sites-available/www.summit.ttm.sh.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/www.summit.ttm.sh.conf
@ -0,0 +1,8 @@
+<VirtualHost *:80>
+    ServerAdmin amcclure@ttm.sh
+    ServerName www.summit.ttm.sh
+    ServerAlias summit.ttm.sh
+    DocumentRoot /var/www/summit/www
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
--- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
@ -2,7 +2,7 @@
 <VirtualHost *:443>
    ServerAdmin amcclure@ttm.sh
    ServerName www.thunix.cf
-    DocumentRoot /var/www/thunix.cf
+    DocumentRoot /var/www/thunix/www
    ErrorLog ${APACHE_LOG_DIR}/error.log
    CustomLog ${APACHE_LOG_DIR}/access.log combined
 SSLCertificateFile /etc/letsencrypt/live/www.thunix.cf/fullchain.pem
--- a/roles/webserver/files/etc/apache2/sites-available/you.wer.ee.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/you.wer.ee.conf
@ -1,11 +0,0 @@
-    <VirtualHost *:80>
-        ServerAdmin amcclure@ttm.sh
-        ServerName you.wer.ee
-        DocumentRoot /var/www/you.wer.ee
-        ErrorLog ${APACHE_LOG_DIR}/error.log
-        CustomLog ${APACHE_LOG_DIR}/access.log combined
-        <Directorymatch "^/.*/\.git/">
-                    Order deny,allow
-                    Deny from all
-            </Directorymatch>
-    </VirtualHost>
--- a/roles/webserver/tasks/apache.yml
+++ b/roles/webserver/tasks/apache.yml
@ -1,100 +1,86 @@
 #This play configs apapche for us
 ---
-##Sites
-
- name: Deploy Apache2 Site Config 000-default.conf
+- name: Deploy 000-default.conf
  copy:
    src: ../files/etc/apache2/sites-available/000-default.conf
    dest: /etc/apache2/sites-available/000-default.conf

- name: Deploy Apache2 Site Config default-ssl.conf
+- name: Deploy default-ssl.conf
  copy:
    src: ../files/etc/apache2/sites-available/default-ssl.conf
    dest: /etc/apache2/sites-available/default-ssl.conf

- name: Deploy Apache2 Site Config mail.thunix.cf.conf
+- name: Deploy ftp.summit.ttm.sh.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/ftp.summit.ttm.sh.conf
+    dest: /etc/apache2/sites-available/ftp.summit.ttm.sh.conf
+
+- name: Deploy ftp.summit.ttm.sh-le-ssl.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf
+    dest: /etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf
+
+- name: Deploy mail.thunix.cf.conf
  copy:
    src: ../files/etc/apache2/sites-available/mail.thunix.cf.conf
    dest: /etc/apache2/sites-available/mail.thunix.cf.conf

-#- name: Deploy Apache2 Site Config mail.thunix.cf-le-ssl.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf
-#    dest: /etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf
+- name: Deploy mail.thunix.cf-le-ssl.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf
+    dest: /etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf

- name: Deploy Apache2 Site Config ny.dyniform.net.conf
+- name: Deploy ny.dyniform.net.conf
  copy:
    src: ../files/etc/apache2/sites-available/ny.dyniform.net.conf
    dest: /etc/apache2/sites-available/ny.dyniform.net.conf

- name: Deploy Apache2 Site Config thunix.cf.conf
+- name: Deploy summit-nosite.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/summit-nosite.conf
+    dest: /etc/apache2/sites-available/summit-nosite.conf
+
+- name: Deploy summit.ttm.sh.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/summit.ttm.sh.conf
+    dest: /etc/apache2/sites-available/summit.ttm.sh.conf
+
+- name: Deploy summit.ttm.sh-le-ssl.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf
+    dest: /etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf
+
+- name: Deploy thunix.cf.conf
  copy:
    src: ../files/etc/apache2/sites-available/thunix.cf.conf
    dest: /etc/apache2/sites-available/thunix.cf.conf

-#- name: Deploy Apache2 Site Config thunix.cf-le-ssl.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
-#    dest: /etc/apache2/sites-available/thunix.cf-le-ssl.conf
+- name: Deploy thunix.cf-le-ssl.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
+    dest: /etc/apache2/sites-available/thunix.cf-le-ssl.conf

- name: Deploy Apache2 Site Config thunix.tilde.chat.conf
+- name: Deploy thunix.tilde.chat.conf
  copy:
    src: ../files/etc/apache2/sites-available/thunix.tilde.chat.conf
    dest: /etc/apache2/sites-available/thunix.tilde.chat.conf

-#- name: Deploy Apache2 Site Config thunix.tilde.chat.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/thunix.tilde.chat.conf
-#    dest: /etc/apache2/sites-available/thunix.tilde.chat.conf
+- name: Deploy www.summit.ttm.sh.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/www.summit.ttm.sh.conf
+    dest: /etc/apache2/sites-available/www.summit.ttm.sh.conf

- name: Deploy Apache2 Site Config www.thunix.cf.conf
+- name: Deploy www.summit.ttm.sh-le-ssl.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf
+    dest: /etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf
+
+- name: Deploy www.thunix.cf.conf
  copy:
    src: ../files/etc/apache2/sites-available/www.thunix.cf.conf
    dest: /etc/apache2/sites-available/www.thunix.cf.conf

-#- name: Deploy Apache2 Site Config www.thunix.cf-le-ssl.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
-#    dest: /etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
-
- name: Deploy Apache2 Site Config amcclure.cf.conf
+- name: Deploy www.thunix.cf-le-ssl.conf
  copy:
-    src: ../files/etc/apache2/sites-available/amcclure.cf.conf
-    dest: /etc/apache2/sites-available/amcclure.cf.conf
-
- name: Deploy Apache2 Site Config www.amcclure.cf.conf
-  copy:
-    src: ../files/etc/apache2/sites-available/www.amcclure.cf.conf
-    dest: /etc/apache2/sites-available/www.amcclure.cf.conf
-
-#- name: Deploy Apache2 Site Config amcclure.cf.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/amcclure.cf-le-ssl.conf
-#    dest: /etc/apache2/sites-available/amcclure.cf-le-ssl.conf
-
- name: Deploy Apache2 Site Config amcclure.tilde.conf
-  copy:
-    src: ../files/etc/apache2/sites-available/amcclure.tilde.conf
-    dest: /etc/apache2/sites-available/amcclure.tilde.conf
-    
- name: Deploy Apache2 Site Config www.amcclure.tilde.conf
-  copy:
-    src: ../files/etc/apache2/sites-available/www.amcclure.tilde.conf
-    dest: /etc/apache2/sites-available/www.amcclure.tilde.conf
-    
- name: Deploy Apache2 Site Config www.amcclure.ttm.sh.conf
-  copy:
-    src: ../files/etc/apache2/sites-available/amcclure.ttm.sh.conf
-    dest: /etc/apache2/sites-available/amcclure.ttm.sh.conf
-
- name: Deploy Apache2 Site Config you.wer.ee.conf
-  copy:
-    src: ../files/etc/apache2/sites-available/you.wer.ee.conf
-    dest: /etc/apache2/sites-available/you.wer.ee.conf
-
-##Mods
-
-#- name: Deploy Apache2 Module Config php7.0.conf
-#  copy:
-#    src: ../files/etc/apache2/mods-available/php7.0.conf
-#    dest: /etc/apache2/mods-available/php7.0.conf
+    src: ../files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
+    dest: /etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
--- a/roles/webserver/tasks/apache2-mods.yml
+++ b/roles/webserver/tasks/apache2-mods.yml
@ -1,14 +0,0 @@
-# Enable or disable apache2 mods
---
- name: userdir
-  apache2_module:
-    name: userdir
-    state: present
- name: ssl
-  apache2_module:
-    name: ssl
-    state: present
- name: php7.0
-  apache2_module:
-    name: php7.0
-    state: present
--- a/roles/webserver/tasks/codedeploy.yml
+++ b/roles/webserver/tasks/codedeploy.yml
@ -1,5 +1,5 @@
 # This play deploys the www code
 # Example git checkout from Ansible Playbooks
 - git:
-    repo: 'https://tildegit.org/thunix/www.git'
+    repo: 'https://tildegit.org/thunix/main_site.git'
    dest: /var/www/thunix.cf
--- a/roles/webserver/tasks/main.yml
+++ b/roles/webserver/tasks/main.yml
@ -2,7 +2,6 @@
 # This playbook contains all of the www config

 - include: packages.yml
-  #- include: users.yml
+- include: users.yml
 - include: apache.yml
 - include: codedeploy.yml
- include: apache2-mods.yml
--- a/roles/webserver/tasks/packages.yml
+++ b/roles/webserver/tasks/packages.yml
@ -27,3 +27,6 @@
      - php7.0-tidy
      - php7.0-xmlrpc
      - php7.0-xsl
+      - python-certbot-apache
+      
+