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

roles/shell/files/usr/local/bin/backup

@@ -1,9 +1,11 @@
 #!/bin/bash
 
 DATE=$(date +%Y%m%d)
-PATH='/var/backups'
+BACKUPS=/var/backups
 
-tar -cvz \
+find $BACKUPS -name "*.tgz" -mtime +3 -exec rm {} \;
+
+tar -cz \
  --exclude ".nobackup" \
  --exclude "nobackup" \
  --exclude "/home/irc/*" \
@@ -19,16 +21,14 @@ tar -cvz \
  /var/games/minetest-server/.minetest/ \
  /var/lib/minecraft/paperclip/ \
  /var/lib/bzflag/ \
+ /var/lib/znc/ \
  /var/spool/cron/ \
  /var/spool/anacron/ \
- -f $PATH/$DATE.tgz
+ -f $BACKUPS/$DATE.tgz
 
-mysqldump --all-databases > $PATH/$DATE-all_databases.sql
-tar --remove-files -cz $PATH/$DATE-all_databases.sql \
- -f $PATH/$DATE-all_databases.sql.tgz
+mysqldump --all-databases > $BACKUPS/$DATE-all_databases.sql
+tar --remove-files -cz $BACKUPS/$DATE-all_databases.sql \
+ -f $BACKUPS/$DATE-all_databases.sql.tgz
 
-chown root:sudo $PATH/$DATE*.tgz
-chmod 640 $PATH/*.tgz
-
-find $PATH -name "*.tgz" -mtime +3 -exec rm {} \;
-rm $PATH/all_databases.sql
+chown root:sudo $BACKUPS/$DATE*.tgz
+chmod 640 $BACKUPS/*.tgz

roles/shell/tasks/packages.yml

@@ -77,6 +77,7 @@
       - cmake
       - cmake-curses-gui
       - cmark
+      - cmatrix
       - context
       - cowsay
       - devscripts
@@ -94,6 +95,8 @@
       - finger
       - fingerd
       - fish
+      - flatpak
+      - flatpak-builder
       - flex
       - fortune
       - frotz
@@ -107,6 +110,7 @@
 #      - ident2
       - inkscape
       - imagemagick
+      - ircii
       - irssi
       - isync
       - jekyll

roles/shell/tasks/users.yml

@@ -299,3 +299,6 @@
 - include: users/deli.yml
 - include: users/fltk.yml
 - include: users/login.yml
+- include: users/ricci.yml
+- include: users/hedy.yml
+- include: users/zackward.yml

roles/shell/tasks/users/hedy.yml

@@ -0,0 +1,15 @@
+---
+- name: Setting up hedy
+  user:
+    name: hedy
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/hedy
+- authorized_key:
+    user: hedy
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDH3B4ogxuJELUS+6esjEVYlItu1yAeQiwl1ghEng3iHME8LdybakrWKyZ1jGEbAEg8KR3/x/Ypr2ZCFfaAAX3PY11hTMRKxeSwQ75XtvPEiCukF0uB9G6hX8POFQK0KFn3LB00HOc7qMnToRuSrPX+Amryfgbx2TP1MsExr7zuKfwL+OEBwbGMiq2wlDF/Jz3NzbdQh7NfpB4VJx+NNHkeT2sPmSzX48G9goNeWLXFEziTmSnxuhqXbhr/g4Fkhqh4lfgbj1pbj93Mzys1MJYfphvq9cZpminTOM0M98vw+zOf0bxxV55dpoQksxISQX4VoS8MPFZi+gU9ABzKPn41qSdt71p+hIhCmwIwCwzkPXk+bRM/b0BRQNDdh1RqlSXenZmhObSKQTfWWYIY7DXe7tH0cfl82/VNCGKkm06J7DOb1a4YHsKenhc9EpkF18PRNH9/++j6lyESMbmyszwZOHwCvEzRjSPFGj79Q1HGLjR07Bq0GrCBGtNBjy28ctgWx/1ZcmlrmBw+Uy4IVyTKQDM9haTAqKQ/JPXJu5H3JiaqjrwkiMDHqon8lm1P7J1smWYHrtEkZYx89haNfOA8pAQCeR1D1yXuNmPBLUnW2G0HP7RGRnQBiFXep5Wz0LLastQZCnQzNoLWUoaefbMEwKul40wUUvNAd9v1Kqi0JQ=="

roles/shell/tasks/users/ricci.yml

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

roles/shell/tasks/users/zackward.yml

@@ -0,0 +1,15 @@
+---
+- name: Setting up zackward
+  user:
+    name: zackward
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/zackward
+- authorized_key:
+    user: zackward
+    state: present
+    key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAfn1rpWFgz0MDsjUjYUywNbxIIBER/c01NQJyMwbWJ+DGxOF1wx1sFTkHSfpJDeNg+oY6ddR1MEI8srLjoY90yHmhNrZ1iE72kceI5KKdsJhJMBbILD9fg0MYp7WAoTRZoLelC2XEmdmRqp6fk/gHdBonbktajV32nn2nVub53ABf5ECPC1MMSeeST3l6m9j5DXNmISJByvQiU3ymdOyr/rDF47OwPpiw9DVlF93TbfoEdYtSP9LrDu+MsXlE0/VJsReTGyhS2FYvXH3GYfFoUvaIcgJdCgcXeSm/BdEq+AmpeyIg4zaRlQKCii0b2NQgvocCjMqrIl+RzyWK5FKzNW51VHS/PlnDObJ0fFHfKTlXgHUKmlonygYWuu93pmeu4ihUExtrXcNhWRvyKE8EfrhQoTETsYQItwbgiAyeWI1XgWM8azbeRFJDQNiohgOncS+eT7VuiXi/JosAxsYuyJuIe8CnK+JU/L9m3ois5JRA2UBI7EERKk8Z7b2gz+2gKN+OzpjIfH3KsVlVghGAGoN90/AZIR9Kk2HMX18pqp3R/TEULL5duT26IgwZdfwqVfv/xbasHL2fgnZHmi+UDOJsxnn/KgfHCe6cEdfLt6uhTcuH0LezTo2ncn7a3459P9b+N0o9sCbRppsPXDB/EVumrOwA1f9G9RCo9x7tHQ== SSH"

roles/shell/tasks/znc.yml

@@ -2,7 +2,7 @@
 ---
 - name: Create home dirs for znc 
   file:
-    path: /var/lib/znc/.znc
+    path: /var/lib/znc
     state: directory
     owner: znc
     group: root
@@ -28,7 +28,7 @@
       After=network-online.target
 
       [Service]
-      ExecStart=/usr/bin/znc -f --datadir=/var/lib/znc/.znc
+      ExecStart=/usr/bin/znc -f --datadir=/var/lib/znc
       ExecReload=/bin/kill -HUP $MAINPID
       User=znc