From b2a8a02a5c42dcc0d5d0dd5ce221e93f06ed261c Mon Sep 17 00:00:00 2001
From: Naglfar <naglfar@tilde.team>
Date: Fri, 24 Sep 2021 09:41:18 +0200
Subject: [PATCH] Adding user vxrx

---
 roles/shell/files/usr/local/bin/backup | 13 ++++++++++++-
 roles/shell/tasks/users.yml            |  1 +
 roles/shell/tasks/users/vxrx.yml       | 15 +++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 roles/shell/tasks/users/vxrx.yml

diff --git a/roles/shell/files/usr/local/bin/backup b/roles/shell/files/usr/local/bin/backup
index 4f5c919..8783995 100644
--- a/roles/shell/files/usr/local/bin/backup
+++ b/roles/shell/files/usr/local/bin/backup
@@ -5,6 +5,16 @@ BACKUPS=/var/backups
 
 find $BACKUPS -name "*.tgz" -mtime +3 -exec rm {} \;
 
+PREVIOUS=$(find $BACKUPS -name "*incr.tgz" | wc -l)
+
+if [ $PREVIOUS -le 8 ]
+then
+  TYPE=incr
+else
+  TYPE=full
+  rm $BACKUPS/incr.tgz $BACKUPS/$DATE.snapshot
+fi
+
 tar -cz \
  --exclude ".nobackup" \
  --exclude "nobackup" \
@@ -25,7 +35,8 @@ tar -cz \
  /var/lib/znc/configs/ /var/lib/znc/moddata/ \
  /var/spool/cron/ \
  /var/spool/anacron/ \
- -f $BACKUPS/$DATE.tgz
+ -g $BACKUPS/$DATE.snapshot \
+ -f $BACKUPS/$DATE-$TYPE.tgz
 
 chown root:sudo $BACKUPS/$DATE*.tgz
 chmod 640 $BACKUPS/*.tgz
diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml
index ea5679a..95023a8 100644
--- a/roles/shell/tasks/users.yml
+++ b/roles/shell/tasks/users.yml
@@ -370,3 +370,4 @@
 - include: users/subhambhatta.yml
 - include: users/forero.yml
 - include: users/aiden.yml
+- include: users/vxrx.yml
diff --git a/roles/shell/tasks/users/vxrx.yml b/roles/shell/tasks/users/vxrx.yml
new file mode 100644
index 0000000..b5ee0f4
--- /dev/null
+++ b/roles/shell/tasks/users/vxrx.yml
@@ -0,0 +1,15 @@
+---
+- name: Setting up vxrx
+  user:
+    name: vxrx
+    groups: tilde
+    state: present
+    skeleton: /etc/skel
+    shell: /bin/bash
+    system: no
+    createhome: yes
+    home: /home/vxrx
+- authorized_key:
+    user: vxrx
+    state: present
+    key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICGqXL0P01BAQ6pYRqmkQ1XD9456KjcVYPiaBX+PloW7 vxrx@jmp01"