transmission: improve the service

[sourcephile-nix.git] / servers / losurdo / Makefile

diff --git a/servers/losurdo/Makefile b/servers/losurdo/Makefile
index 55725f2d62e683c43563d73d6662f17612d6c2a7..94742700d705db48674c52aae0c68f56387dca0a 100644 (file)
--- a/servers/losurdo/Makefile
+++ b/servers/losurdo/Makefile
@@ -2,35 +2,40 @@
 #disk       := /dev/disk/by-id/usb-Generic-_Multi-Card_20071114173400000-0:0
 #disk       := /dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_250GB_S4EUNJ0N211426T
 server      := losurdo
-disk        := $(shell sourcephile-nix-get nodes.$(server).config.boot.loader.grub.devices.0)
-partlabel   := $(server)_sd
-rpool       := $(partlabel)
+disk_sd     := $(shell sourcephile-nix-get nodes.$(server).config.boot.loader.grub.devices.0)
+disk_nvme   := /dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_250GB_S4EUNJ0N211426T
+rpool       := $(server)_nvme
 cipher      := aes-128-gcm
 autotrim    := on
 reservation := 1G
+#unicode_normalization := formD
 
-wipeout:
+wipe-sd:
        sudo modprobe zfs
-       sudo zpool labelclear -f $(disk)-part4 || true
-       sudo $$(which sgdisk) --zap-all $(disk)
+       sudo zpool labelclear -f /dev/disk/by-partlabel/$(server)_nvme_rpool || true
+       sudo $$(which sgdisk) --zap-all $(disk_sd)
 
-partition: wipeout
-       sudo $$(which sgdisk) -a1 -n0:34:2047  -t0:EF02 -c0:"$(partlabel)_bios"  $(disk)
-       sudo $$(which sgdisk)     -n0:1M:+100M -t0:EF00 -c0:"$(partlabel)_efi"   $(disk)
-       sudo $$(which sgdisk)     -n0:0:+256M  -t0:8300 -c0:"$(partlabel)_boot"  $(disk)
-       #sudo $$(which sgdisk)     -n0:0:+8G    -t0:8200 -c0:"$(partlabel)_swap"  $(disk)
-       sudo $$(which sgdisk)     -n0:0:0      -t0:BF01 -c0:"$(partlabel)_rpool" $(disk)
-       sudo $$(which sgdisk) --randomize-guids $(disk)
-       sudo $$(which sgdisk) --backup=$(partlabel).sgdisk $(disk)
+part: wipe-sd wipe-nvme
+part-sd: wipe-sd
+       sudo $$(which sgdisk) -a1 -n0:34:2047  -t0:EF02 -c0:"$(server)_sd_bios"  $(disk_sd)
+       sudo $$(which sgdisk)     -n0:1M:+100M -t0:EF00 -c0:"$(server)_sd_efi"   $(disk_sd)
+       sudo $$(which sgdisk)     -n0:0:+256M  -t0:8300 -c0:"$(server)_sd_boot"  $(disk_sd)
+       sudo $$(which sgdisk) --randomize-guids $(disk_sd)
+       sudo $$(which sgdisk) --backup=$(server)_sd.sgdisk $(disk_sd)
+part-nvme:
+       sudo $$(which sgdisk) -n0:0:+8G -t0:8200 -c0:"$(server)_nvme_swap"  $(disk_nvme)
+       sudo $$(which sgdisk) -n0:0:0   -t0:BF01 -c0:"$(server)_nvme_rpool" $(disk_nvme)
+       sudo $$(which sgdisk) --randomize-guids $(disk_nvme)
+       sudo $$(which sgdisk) --backup=$(server)_nvme.sgdisk $(disk_nvme)
 
 format: umount format-efi format-boot format-rpool
 format-efi:
-       sudo blkid $(disk)-part2 -t TYPE=vfat || \
-       sudo mkfs.vfat -F 16 -s 1 -n EFI $(disk)-part2
+       sudo blkid /dev/disk/by-partlabel/$(server)_sd_efi -t TYPE=vfat || \
+       sudo mkfs.vfat -F 16 -s 1 -n EFI /dev/disk/by-partlabel/$(server)_sd_efi
 format-boot:
        sudo mkdir -p /mnt/$(server)
-       sudo blkid -t TYPE=ext2 $(disk)-part3; test $$? != 2 || \
-       sudo mkfs.ext2 $(disk)-part3
+       sudo blkid -t TYPE=ext2 /dev/disk/by-partlabel/$(server)_sd_boot; test $$? != 2 || \
+       sudo mkfs.ext2 /dev/disk/by-partlabel/$(server)_sd_boot
 format-rpool:
        sudo zpool list $(rpool) 2>/dev/null || \
        sudo zpool create -o ashift=12 \
@@ -38,7 +43,8 @@ format-rpool:
         -O keyformat=passphrase \
         -O keylocation=prompt) \
         -O normalization=formD \
-        -R /mnt/$(server) $(rpool) $(disk)-part4
+        $(if $(unicode_normalization),-O normalization=$(unicode_normalization) \
+        -R /mnt/$(server) $(rpool) /dev/disk/by-partlabel/$(server)_nvme_root
        sudo zpool set \
         autotrim=$(autotrim) \
         $(rpool)
@@ -127,19 +133,19 @@ mount-rpool:
 mount-boot:
        sudo mkdir -p /mnt/$(server)/boot
        sudo mountpoint /mnt/$(server)/boot || \
-       sudo mount -v $(disk)-part3 /mnt/$(server)/boot
+       sudo mount -v /dev/disk/by-partlabel/$(server)_sd_boot /mnt/$(server)/boot
        #sudo mount -v -t zfs bpool/boot /mnt/$(server)/boot
 mount-efi: | mount-boot
        sudo mkdir -p /mnt/$(server)/boot/efi
        sudo mountpoint /mnt/$(server)/boot/efi || \
-       sudo mount -v $(disk)-part2 /mnt/$(server)/boot/efi
+       sudo mount -v /dev/disk/by-partlabel/$(server)_sd_efi /mnt/$(server)/boot/efi
 
 bootstrap: mount
        # Workaround https://dev.gnupg.org/T3908
        chmod o+rw $$GPG_TTY $$XAUTHORITY
        
        sudo --preserve-env \
-       NIXOS_CONFIG="$$PWD/configuration.nix" \
+       NIXOS_CONFIG="$$PWD/install.nix" \
        $$(which nixos-install) \
         --root /mnt/$(server) \
         --no-root-passwd \
@@ -178,6 +184,6 @@ umount:
        sudo zpool export $(rpool)
 
 unlock:
-       pass servers/$(server)/zfs/$(rpool) | \
+       pass servers/$(server)/zfs/rpool | \
        NIXOPS_DEPLOYMENT="$${NIXOPS_DEPLOYMENT:-$(LOSURDO_DEPLOYMENT)}" \
        nixops ssh $(server) -p 2222 'zfs load-key $(rpool) && pkill zfs'