Merge branch 'master' into fetlab

doc/ariane.md

@@ -88,20 +88,22 @@ zfs create -o canmount=off -o setuid=off -o exec=off ssd/var
 zfs create -o com.sun:auto-snapshot=false -o mountpoint=/var/lib/nfs ssd/var/nfs
 zfs create -o com.sun:auto-snapshot=false -o exec=on ssd/var/cache
 zfs create ssd/var/log
-zfs create -o exec=on ssd/var/lxc
+zfs create -o setuid=on -o exec=on ssd/var/lxc
 mv /var/cache/* /ssd/var/cache/
 zfs set mountpoint=/var/cache/ ssd/var/cache
 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
 ```
 ### 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

doc/fsdrnas.yml

@@ -0,0 +1,20 @@
+# fsdrnas
+## Enable SSH and prohibit-password
+```shell
+xbps-install -Su
+vim /etc/ssh/sshd_config
+ln -s /etc/sv/sshd/ /var/service/
+```
+# Create RAID
+```shell
+xbps-install mdadm
+mdadm --create --verbose /dev/md0 --level=1 --raid-devices=2 /dev/sda2 /dev/sdb2
+mkfs.btrfs -f /dev/md0
+cat /proc/mdstat
+```
+## Check disks
+```shell
+xbps-install smartmontools
+smartctl -a /dev/sda
+smartctl -a /dev/sdb
+```

doc/gitea.md

@@ -3,7 +3,8 @@
 ## Setup using installer, create user root
 
 ```shell
-INSTALL_LOCK to false
+vim /etc/gitea.conf # INSTALL_LOCK to false
+sv restart gitea
 ```
 
 ## Gitea LDAP Authentication settings
@@ -21,3 +22,16 @@ INSTALL_LOCK to false
 - Email attribute: `mail`
 
 No Bind-DN and password needed!
+
+## Create backup dump to file
+
+```shell
+cd /var/lib/gitea/
+sudo -u _gitea gitea dump -c /etc/gitea.conf
+```
+
+## Reset root password
+```shell
+cd /var/lib/gitea/
+sudo -u _gitea gitea admin change-password --config /etc/gitea.conf -u root -p pw
+```

doc/laika.md

@@ -1,4 +1,4 @@
-# sojus
+# laika
 
 ## test if backups work
 ```shell
@@ -10,7 +10,7 @@ borg check -v <repo>/system
 ## test if backups work from remote
 ```shell
 /etc/borg/system_create_<pool>.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-<ID>-part1
 sync

doc/progress.md

@@ -0,0 +1,6 @@
+# Check if share works
+
+```shell
+smbclient -L //localhost -U dell
+smbclient //localhost/scans -U dell
+```