diff --git a/doc/ariane.md b/doc/ariane.md index 5eb1663..06976ee 100644 --- a/doc/ariane.md +++ b/doc/ariane.md @@ -95,7 +95,7 @@ mv /var/log/* /ssd/var/log/ zfs set mountpoint=/var/log ssd/var/log mv /var/lib/lxc/* /ssd/var/lxc/ zfs set mountpoint=/var/lib/lxc ssd/var/lxc -zfs create -o com.sun:auto-snapshot=false zv1/sojus +zfs create -o com.sun:auto-snapshot=false zv1/laika zfs create -o com.sun:auto-snapshot=false zv1/daten/Scans zfs create -o setuid=off -o zv1/zyklon chown 997:996 /zv1/zyklon @@ -103,7 +103,7 @@ chown 997:996 /zv1/zyklon ### Set dataset quota ```shell zfs set quota=1T zv1/homes zv1/daten zv1/fotos -zfs set quota=3T zv1/sojus +zfs set quota=3T zv1/laika zfs set quota=5G zv1/daten/Scans ``` ### If intend using ACL someday diff --git a/doc/sojus.md b/doc/laika.md similarity index 86% rename from doc/sojus.md rename to doc/laika.md index 9653b67..bf62e5e 100644 --- a/doc/sojus.md +++ b/doc/laika.md @@ -1,4 +1,4 @@ -# sojus +# laika ## test if backups work ```shell @@ -10,7 +10,7 @@ borg check -v /system ## test if backups work from remote ```shell /etc/borg/system_create_.sh -cat /var/log/borg/system_create_sojus.lastlog +cat /var/log/borg/system_create_laika.lastlog ``` ## retrieve files from backup @@ -30,7 +30,7 @@ zpool import zpool import lab zfs create -o com.sun:auto-snapshot=false lab/backup borg init -e none /lab/backup/ariane.fet.htu.tuwien.ac.at -./borg create --show-rc --verbose --stats backup@sojus:system::ariane-{now} /zv1/daten /zv1/fotos /zv1/homes +./borg create --show-rc --verbose --stats backup@laika:system::ariane-{now} /zv1/daten /zv1/fotos /zv1/homes zpool export lab cryptsetup luksClose ata--part1 sync diff --git a/host_vars/ariane b/host_vars/ariane index 7b3e027..5771984 100644 --- a/host_vars/ariane +++ b/host_vars/ariane @@ -25,15 +25,6 @@ lxc: - lxc.network.1.ipv4.gateway = 128.131.95.1 - lxc.pts = 6 - - name: laika - revision: "01" - template: debian - config: - - lxc.network.type = veth - - lxc.network.hwaddr = 1c:bd:b9:7f:fe:a4 - - lxc.network.link = br1 - - lxc.network.flags = up - - name: betam revision: "01" template: debian @@ -66,7 +57,7 @@ lxc: - lxc.pts = 6 - lxc.mount.entry = /zv1/daten/Scans /var/lib/lxc/lxc-progress-01/rootfs/mnt/scans none bind,create=dir 0 0 - - name: sojus + - name: laika revision: "01" template: voidlinux config: @@ -74,8 +65,16 @@ lxc: - lxc.network.hwaddr = 2e:6d:b6:07:17:01 - lxc.network.link = br1 - lxc.network.flags = up + + - lxc.network.1.type = veth + - lxc.network.1.hwaddr = 00:15:c5:5d:78:0e + - lxc.network.1.link = br0 + - lxc.network.1.flags = up + - lxc.network.1.ipv4 = 128.131.95.204/24 + - lxc.network.1.ipv4.gateway = 128.131.95.1 + - lxc.pts = 6 - - lxc.mount.entry = /zv1/sojus /var/lib/lxc/lxc-sojus-01/rootfs/home/backup/repos none bind,create=dir 0 0 + - lxc.mount.entry = /zv1/laika /var/lib/lxc/lxc-laika-01/rootfs/home/backup/repos none bind,create=dir 0 0 - name: proteus revision: "01" diff --git a/host_vars/baroness b/host_vars/baroness index afd8f40..6d31253 100644 --- a/host_vars/baroness +++ b/host_vars/baroness @@ -7,7 +7,7 @@ borgbackup_binary_uri: "https://borg.bauerj.eu/borg-{{ borgbackup_binary_version borgbackup_encryption_mode: "none" -borgbackup_client_backup_server: sojus +borgbackup_client_backup_server: laika borgbackup_create_jobs: - name: system diff --git a/host_vars/buran b/host_vars/buran index 52809fb..b6cc497 100644 --- a/host_vars/buran +++ b/host_vars/buran @@ -6,7 +6,7 @@ borgbackup_binary_platform: "borg-linux32" borgbackup_encryption_mode: "none" -borgbackup_client_backup_server: sojus +borgbackup_client_backup_server: laika borgbackup_create_jobs: - name: system diff --git a/host_vars/laika b/host_vars/laika index 72f2338..c015965 100644 --- a/host_vars/laika +++ b/host_vars/laika @@ -1,2 +1,7 @@ inventory_hostname: laika.fet.htu.tuwien.ac.at inventory_hostname_short: laika + +borgbackup_install_from_repo: True +borgbackup_binary: "/usr/bin/borg" + +borgbackup_encryption_mode: "none" diff --git a/host_vars/maria-storage b/host_vars/maria-storage index 486f8dc..845669c 100644 --- a/host_vars/maria-storage +++ b/host_vars/maria-storage @@ -5,7 +5,7 @@ borgbackup_install_from_repo: False borgbackup_encryption_mode: "none" -borgbackup_client_backup_server: sojus +borgbackup_client_backup_server: laika borgbackup_create_jobs: - name: system diff --git a/host_vars/nauka b/host_vars/nauka index 9e184cf..5a4751d 100644 --- a/host_vars/nauka +++ b/host_vars/nauka @@ -5,7 +5,7 @@ borgbackup_install_from_repo: False borgbackup_encryption_mode: "none" -borgbackup_client_backup_server: sojus +borgbackup_client_backup_server: laika borgbackup_create_jobs: - name: system diff --git a/host_vars/sojus b/host_vars/sojus deleted file mode 100644 index 3972b5d..0000000 --- a/host_vars/sojus +++ /dev/null @@ -1,7 +0,0 @@ -inventory_hostname: sojus.fet.htu.tuwien.ac.at -inventory_hostname_short: sojus - -borgbackup_install_from_repo: True -borgbackup_binary: "/usr/bin/borg" - -borgbackup_encryption_mode: "none" diff --git a/hosts/production b/hosts/production index 82f0b51..db14146 100644 --- a/hosts/production +++ b/hosts/production @@ -5,14 +5,13 @@ all: ariane: fet_lxc_debian: hosts: - laika: betam: proteus: fet_lxc_void: hosts: sputnik: zyklon: - sojus: + laika: progress: fet_qemu: hosts: diff --git a/site.yml b/site.yml index 13da812..e788de9 100644 --- a/site.yml +++ b/site.yml @@ -39,7 +39,7 @@ roles: - gitea -- hosts: sojus +- hosts: laika roles: - borg_server