diff --git a/doc/ariane.md b/doc/ariane.md index 0dd4521..206f5f7 100644 --- a/doc/ariane.md +++ b/doc/ariane.md @@ -19,6 +19,7 @@ systemctl restart zfs-share ### Find disk serial numbers ```shell for i in a b c d e f g h i; do echo -n "/dev/sd$i: "; hdparm -I /dev/sd$i | awk '/Serial Number/ {print $3}'; done +nvme list ``` ### Wipe disks ```shell @@ -36,7 +37,7 @@ cryptsetup luksFormat /dev/disk/by-id/ata-WDC_WD60EFRX-68L0BN1_WD-WX21D36PPLPH-p cryptsetup luksFormat /dev/disk/by-id/ata-WDC_WD60EFRX-68L0BN1_WD-WX21D36PP0K1-part1 cryptsetup luksFormat /dev/disk/by-id/ata-WDC_WD60EFRX-68L0BN1_WD-WXB1HB4MJCMM-part1 ``` -### Create zpool +### Create zpools ```shell ./mountVolumes.sh mount zpool create -o ashift=12 -o autoexpand=on -o autoreplace=on -O atime=off -O compression=lz4 \ @@ -46,6 +47,7 @@ zpool create -o ashift=12 -o autoexpand=on -o autoreplace=on -O atime=off -O com /dev/mapper/ata-WDC_WD60EFRX-68L0BN1_WD-WX21D36PP0K1-part1 \ /dev/mapper/ata-WDC_WD60EFRX-68L0BN1_WD-WXB1HB4MJCMM-part1 zpool add zv1 log mirror /dev/nvme0n1p5 /dev/nvme1n1p5 +zpool create -o ashift=12 -O atime=off -O compression=lz4 ssd mirror /dev/disk/by-id/nvme-INTEL_SSDPEKKW128G7_BTPY63830DUM128A-part9 /dev/disk/by-id/nvme-INTEL_SSDPEKKW128G7_BTPY63750L9G128A-part9 ``` ### Create datasets ```shell @@ -54,6 +56,17 @@ zfs create zv1/daten zfs create zv1/fotos chown root:nogroup /zv1/homes chown root:2000 /zv1/daten/ /zv1/fotos/ +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 ssd/var/cache +zfs create ssd/var/log +zfs create -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 ``` ### Set dataset quota ```shell @@ -85,10 +98,6 @@ zfs export ```shell zfs import ``` -### Add 2GB log partition on ssd -```shell -zpool add zv1 log mirror /dev/nvme0n1p2 /dev/nvme1n1p2 -``` ## ZFS Maintenance ```shell zpool status -v @@ -99,7 +108,7 @@ zpool scrub zv1 ``` ### show and delete all snapshots ```shell -zfs get mountpoint +zfs list -t snapshot zfs list -H -o name -t snapshot | xargs -n1 zfs destroy ``` ## MDADM Maintenance diff --git a/group_vars/fet_hosts b/group_vars/fet_hosts index 5ef59e7..66dcc38 100644 --- a/group_vars/fet_hosts +++ b/group_vars/fet_hosts @@ -24,3 +24,5 @@ common_basic_packages: - python3-apt - python3-pycurl # extra + sgdisk + nvme-cli diff --git a/roles/ariane/files/zfs_mount.sh b/roles/ariane/files/zfs_mount.sh index 9b97240..e012f3a 100644 --- a/roles/ariane/files/zfs_mount.sh +++ b/roles/ariane/files/zfs_mount.sh @@ -62,7 +62,6 @@ function closeAllLUKS { do #echo $dev cryptsetup close $dev 2>&1 | 1>>$LOG || { echo "Problem closing $dev!" | tee -a $LOG; exit 0; } - done echo "Done." } @@ -85,7 +84,6 @@ function openAllLUKS { fi pass1="" pass2="" - } function LUKSStatus {