Merge branch 'master' of ttm.sh:thunix/ansible

roles/shell/tasks/users.yml

@@ -93,3 +93,4 @@
 - include: users/vigilant.yml
 - include: users/isaac.yml
 - include: users/moskrin.yml
+- include: users/southerntofu.yml

roles/shell/tasks/users/southerntofu.yml

@@ -0,0 +1,15 @@
+---
+- name: Setting up southerntofu
+  user:
+    name: southerntofu
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/southerntofu
+- authorized_key:
+    user: southerntofu
+    state: present
+    key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG4bKe9LSA3/AY4gCB20eyJVPW+zOg07/b3A4QC0Z6XC user@laptop"

roles/webserver/files/etc/apache2/sites-available/staticadventures.netlib.re.conf

@@ -0,0 +1,28 @@
+<VirtualHost *:80>
+    ServerAdmin webmaster@thunix.net
+    ServerName staticadventures.netlib.re
+    DocumentRoot /var/www/staticadventures.netlib.re
+    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 webmaster@thunix.net
+#    ServerName staticadventures.netlib.re
+#    DocumentRoot /var/www/staticadventures.netlib.re
+#    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/staticadventures.netlib.re/fullchain.pem
+#    SSLCertificateKeyFile /etc/letsencrypt/live/staticadventures.netlib.re/privkey.pem
+#    Include /etc/letsencrypt/options-ssl-apache.conf
+#</VirtualHost>
+#</IfModule>

roles/webserver/tasks/apache.yml

@@ -61,4 +61,10 @@
 - name: Deploy apache2 site conf for lists.thunix.net.conf
   copy:
     src: ../files/etc/apache2/sites-available/lists.thunix.net.conf
-    dest: /etc/apache2/sites-available/lists.thunix.net.conf
+    dest: /etc/apache2/sites-available/lists.thunix.net.conf
+
+- name: Deploy apache2 site conf for staticadventures.netlib.re
+  copy:
+    src: ../files/etc/apache2/sites-available/staticadventures.netlib.re.conf
+    dest: /etc/apache2/sites-available/staticadventures.netlib.re.conf
+