From 1cb89cc3bd37def7c367c855fa5121fee0f0889a Mon Sep 17 00:00:00 2001 From: Julian Jarabo Date: Sat, 12 Dec 2020 11:55:15 +0100 Subject: [PATCH 01/15] Add cmatrix package --- roles/shell/tasks/packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index d10ee35..dd54f77 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -77,6 +77,7 @@ - cmake - cmake-curses-gui - cmark + - cmatrix - context - cowsay - devscripts From 858290ee8e3065420816b21054c79360dd992c50 Mon Sep 17 00:00:00 2001 From: rany Date: Wed, 16 Dec 2020 14:05:38 +0000 Subject: [PATCH 02/15] Add flatpak and flatpak-builder --- roles/shell/tasks/packages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index d10ee35..5a8d6f4 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -94,6 +94,8 @@ - finger - fingerd - fish + - flatpak + - flatpak-builder - flex - fortune - frotz From f6d4a947637052c839bc3e9a872868edff66d9dd Mon Sep 17 00:00:00 2001 From: Naglfar Date: Sun, 20 Dec 2020 00:16:20 +0100 Subject: [PATCH 03/15] script run as daemon, no list files needed --- roles/shell/files/usr/local/bin/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/shell/files/usr/local/bin/backup b/roles/shell/files/usr/local/bin/backup index b113e60..78c40b9 100644 --- a/roles/shell/files/usr/local/bin/backup +++ b/roles/shell/files/usr/local/bin/backup @@ -3,7 +3,7 @@ DATE=$(date +%Y%m%d) PATH='/var/backups' -tar -cvz \ +tar -cz \ --exclude ".nobackup" \ --exclude "nobackup" \ --exclude "/home/irc/*" \ From 9c9a4edb1bdd72ad57e273e2f7e2d496b216de6d Mon Sep 17 00:00:00 2001 From: Naglfar Date: Sun, 20 Dec 2020 00:23:09 +0100 Subject: [PATCH 04/15] file deleted by tar --- roles/shell/files/usr/local/bin/backup | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/shell/files/usr/local/bin/backup b/roles/shell/files/usr/local/bin/backup index 78c40b9..304317b 100644 --- a/roles/shell/files/usr/local/bin/backup +++ b/roles/shell/files/usr/local/bin/backup @@ -31,4 +31,3 @@ chown root:sudo $PATH/$DATE*.tgz chmod 640 $PATH/*.tgz find $PATH -name "*.tgz" -mtime +3 -exec rm {} \; -rm $PATH/all_databases.sql From 12a37b4020eafb761ea16320e630e7b6ac427e81 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Sun, 20 Dec 2020 23:48:16 +0100 Subject: [PATCH 05/15] PATH is already set --- roles/shell/files/usr/local/bin/backup | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/shell/files/usr/local/bin/backup b/roles/shell/files/usr/local/bin/backup index 304317b..216ea98 100644 --- a/roles/shell/files/usr/local/bin/backup +++ b/roles/shell/files/usr/local/bin/backup @@ -1,7 +1,7 @@ #!/bin/bash DATE=$(date +%Y%m%d) -PATH='/var/backups' +BACKUPS=/var/backups tar -cz \ --exclude ".nobackup" \ @@ -21,13 +21,13 @@ tar -cz \ /var/lib/bzflag/ \ /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 +chown root:sudo $BACKUPS/$DATE*.tgz +chmod 640 $BACKUPS/*.tgz -find $PATH -name "*.tgz" -mtime +3 -exec rm {} \; +find $BACKUPS -name "*.tgz" -mtime +3 -exec rm {} \; From 8cb9be8231a57f855799a50775b38d17879a6c2e Mon Sep 17 00:00:00 2001 From: Naglfar Date: Mon, 21 Dec 2020 10:11:07 +0100 Subject: [PATCH 06/15] Clean up, before to create a new one --- roles/shell/files/usr/local/bin/backup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/shell/files/usr/local/bin/backup b/roles/shell/files/usr/local/bin/backup index 216ea98..cb08f09 100644 --- a/roles/shell/files/usr/local/bin/backup +++ b/roles/shell/files/usr/local/bin/backup @@ -3,6 +3,8 @@ DATE=$(date +%Y%m%d) BACKUPS=/var/backups +find $BACKUPS -name "*.tgz" -mtime +3 -exec rm {} \; + tar -cz \ --exclude ".nobackup" \ --exclude "nobackup" \ @@ -29,5 +31,3 @@ tar --remove-files -cz $BACKUPS/$DATE-all_databases.sql \ chown root:sudo $BACKUPS/$DATE*.tgz chmod 640 $BACKUPS/*.tgz - -find $BACKUPS -name "*.tgz" -mtime +3 -exec rm {} \; From dd341779d7bf6eec2fcab983175b7ab17321532d Mon Sep 17 00:00:00 2001 From: Naglfar Date: Mon, 21 Dec 2020 10:20:51 +0100 Subject: [PATCH 07/15] Adding user ricci --- roles/shell/tasks/users.yml | 1 + roles/shell/tasks/users/ricci.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 roles/shell/tasks/users/ricci.yml diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index 9c84da9..c095bb7 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -299,3 +299,4 @@ - include: users/deli.yml - include: users/fltk.yml - include: users/login.yml +- include: users/ricci.yml diff --git a/roles/shell/tasks/users/ricci.yml b/roles/shell/tasks/users/ricci.yml new file mode 100644 index 0000000..f14b809 --- /dev/null +++ b/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" From 8c0f236ac7f57636f341c5294495634436c40a4a Mon Sep 17 00:00:00 2001 From: Naglfar Date: Mon, 21 Dec 2020 10:36:34 +0100 Subject: [PATCH 08/15] add ircII client --- roles/shell/tasks/packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml index d10ee35..1a0daa6 100644 --- a/roles/shell/tasks/packages.yml +++ b/roles/shell/tasks/packages.yml @@ -107,6 +107,7 @@ # - ident2 - inkscape - imagemagick + - ircii - irssi - isync - jekyll From ebc39576867c881742bb1e9c69afb613e10bb358 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Tue, 22 Dec 2020 14:59:50 +0100 Subject: [PATCH 09/15] Adding user hedy --- roles/shell/tasks/users.yml | 1 + roles/shell/tasks/users/hedy.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 roles/shell/tasks/users/hedy.yml diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index c095bb7..8cfef45 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -300,3 +300,4 @@ - include: users/fltk.yml - include: users/login.yml - include: users/ricci.yml +- include: users/hedy.yml diff --git a/roles/shell/tasks/users/hedy.yml b/roles/shell/tasks/users/hedy.yml new file mode 100644 index 0000000..a552989 --- /dev/null +++ b/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==" From f1f2deada70d16b20ac9dc36054a16662120805a Mon Sep 17 00:00:00 2001 From: Naglfar Date: Tue, 22 Dec 2020 20:18:39 +0100 Subject: [PATCH 10/15] Adding user Tintle --- roles/shell/tasks/users.yml | 1 + roles/shell/tasks/users/Tintle.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 roles/shell/tasks/users/Tintle.yml diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index 8cfef45..de9a773 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -301,3 +301,4 @@ - include: users/login.yml - include: users/ricci.yml - include: users/hedy.yml +- include: users/Tintle.yml diff --git a/roles/shell/tasks/users/Tintle.yml b/roles/shell/tasks/users/Tintle.yml new file mode 100644 index 0000000..b617e73 --- /dev/null +++ b/roles/shell/tasks/users/Tintle.yml @@ -0,0 +1,15 @@ +--- +- name: Setting up Tintle + user: + name: Tintle + groups: tilde + state: present + skeleton: /etc/skel + shell: /bin/bash + system: no + createhome: yes + home: /home/Tintle +- authorized_key: + user: Tintle + state: present + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOHPQ6Bk37lpfSrKVqt56BnsKy8u6vxXVLU4iAK/0bF7Zpb2kKWX3dhwJHo96djTq6cLog5eZFyrxLm75jHLnDW435LVVFjGvA6Mu1+ca21mZaX3WQE3uZUA8kdHTsl0CI0H2fRW23trru4kCiWAAiWhn8gz0MkJ8sKwSATQLK2ztxaxzOwF1HKqyqa6c0HYHOlPQbL6HyqG3fIRCUPj1EuYBH3DGAwSKCYGDZ0dEBJ7gHDl8EgBBY71O/K0vxSzS6TYWhqkEyfupFjP/gBcJfjLGGlfpyShtg9VgdvEsvHv8IYIlik6YfM9M0S/1kKau8abNS2xzfGG9XeCKJq/st color@Pastelfina" From 97a6b277c7d328f1cb87796c4dc355355961bf35 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Sat, 26 Dec 2020 21:58:15 +0100 Subject: [PATCH 11/15] Public key replacement, requested by email --- roles/shell/tasks/users/Tintle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/shell/tasks/users/Tintle.yml b/roles/shell/tasks/users/Tintle.yml index b617e73..2574bda 100644 --- a/roles/shell/tasks/users/Tintle.yml +++ b/roles/shell/tasks/users/Tintle.yml @@ -12,4 +12,4 @@ - authorized_key: user: Tintle state: present - key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOHPQ6Bk37lpfSrKVqt56BnsKy8u6vxXVLU4iAK/0bF7Zpb2kKWX3dhwJHo96djTq6cLog5eZFyrxLm75jHLnDW435LVVFjGvA6Mu1+ca21mZaX3WQE3uZUA8kdHTsl0CI0H2fRW23trru4kCiWAAiWhn8gz0MkJ8sKwSATQLK2ztxaxzOwF1HKqyqa6c0HYHOlPQbL6HyqG3fIRCUPj1EuYBH3DGAwSKCYGDZ0dEBJ7gHDl8EgBBY71O/K0vxSzS6TYWhqkEyfupFjP/gBcJfjLGGlfpyShtg9VgdvEsvHv8IYIlik6YfM9M0S/1kKau8abNS2xzfGG9XeCKJq/st color@Pastelfina" + key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAhWX/nWgpr0W7FKHABbdPLB4kw3rhFzEeauauO4dzCwR8y0BuUvWCM0VSKNn6/w4h1Nmfm0q9CSw4uMXIQpO2dBCPbFe2DgNFtN6DYdPLBLZvWPkeM/bhSDS0UtK0kV0c48d+y89etct8dAW6RrqFs/hRYGh6noKSckG3awLFk1EjRqCtQQQWhZQfwcPw4yLcN1/J5d5W1JQvEs8Ugvj791c4mzwHA7UwzTpmakoFHLkwrgHlVfXaQ1/WLUWh+TYZD3pe8a6ox2sG/MnJREVGnVfQj5EwRgSrbrTv/xsRIJ1jmdg/8O1ISUZY56z5NS35NBpaGlJasif1+u4pbeFE3Q==" From 447d167ecad6a5c6329d24d9f1b27a0acec33ad2 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Sun, 27 Dec 2020 20:13:19 +0100 Subject: [PATCH 12/15] Update znc datadir --- roles/shell/tasks/znc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/shell/tasks/znc.yml b/roles/shell/tasks/znc.yml index ee58417..b3e21e0 100644 --- a/roles/shell/tasks/znc.yml +++ b/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 From d1f5750ae4292afaafd83d4dd8cd6e5d997de6e4 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Sun, 27 Dec 2020 21:03:18 +0100 Subject: [PATCH 13/15] Add znc datadir to backup --- roles/shell/files/usr/local/bin/backup | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/shell/files/usr/local/bin/backup b/roles/shell/files/usr/local/bin/backup index cb08f09..b27a796 100644 --- a/roles/shell/files/usr/local/bin/backup +++ b/roles/shell/files/usr/local/bin/backup @@ -21,6 +21,7 @@ tar -cz \ /var/games/minetest-server/.minetest/ \ /var/lib/minecraft/paperclip/ \ /var/lib/bzflag/ \ + /var/lib/znc/ \ /var/spool/cron/ \ /var/spool/anacron/ \ -f $BACKUPS/$DATE.tgz From 9e750edd4a5e2eee15fece0d5ce4f2d1d20f4de0 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Wed, 30 Dec 2020 05:56:48 +0100 Subject: [PATCH 14/15] Adding user zackward --- roles/shell/tasks/users.yml | 1 + roles/shell/tasks/users/zackward.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 roles/shell/tasks/users/zackward.yml diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index de9a773..d510a8f 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -302,3 +302,4 @@ - include: users/ricci.yml - include: users/hedy.yml - include: users/Tintle.yml +- include: users/zackward.yml diff --git a/roles/shell/tasks/users/zackward.yml b/roles/shell/tasks/users/zackward.yml new file mode 100644 index 0000000..bd1a52f --- /dev/null +++ b/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" From 02b94a9dfb14c333e736d9925edc57e2841169b7 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Thu, 31 Dec 2020 00:48:27 +0100 Subject: [PATCH 15/15] Tintle account unenforced in ansible --- roles/shell/tasks/users.yml | 1 - roles/shell/tasks/users/Tintle.yml | 15 --------------- 2 files changed, 16 deletions(-) delete mode 100644 roles/shell/tasks/users/Tintle.yml diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml index d510a8f..98afe4f 100644 --- a/roles/shell/tasks/users.yml +++ b/roles/shell/tasks/users.yml @@ -301,5 +301,4 @@ - include: users/login.yml - include: users/ricci.yml - include: users/hedy.yml -- include: users/Tintle.yml - include: users/zackward.yml diff --git a/roles/shell/tasks/users/Tintle.yml b/roles/shell/tasks/users/Tintle.yml deleted file mode 100644 index 2574bda..0000000 --- a/roles/shell/tasks/users/Tintle.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: Setting up Tintle - user: - name: Tintle - groups: tilde - state: present - skeleton: /etc/skel - shell: /bin/bash - system: no - createhome: yes - home: /home/Tintle -- authorized_key: - user: Tintle - state: present - key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAhWX/nWgpr0W7FKHABbdPLB4kw3rhFzEeauauO4dzCwR8y0BuUvWCM0VSKNn6/w4h1Nmfm0q9CSw4uMXIQpO2dBCPbFe2DgNFtN6DYdPLBLZvWPkeM/bhSDS0UtK0kV0c48d+y89etct8dAW6RrqFs/hRYGh6noKSckG3awLFk1EjRqCtQQQWhZQfwcPw4yLcN1/J5d5W1JQvEs8Ugvj791c4mzwHA7UwzTpmakoFHLkwrgHlVfXaQ1/WLUWh+TYZD3pe8a6ox2sG/MnJREVGnVfQj5EwRgSrbrTv/xsRIJ1jmdg/8O1ISUZY56z5NS35NBpaGlJasif1+u4pbeFE3Q=="