nix: remove upstreamed PR patches
[sourcephile-nix.git] / servers / mermet / Makefile
index e24661bcf6920b411474e4086f63629051d0ddc4..49c03bea71e2424517208ceeaeaec7f0dcfa0c96 100644 (file)
@@ -1,25 +1,36 @@
 #cwd := $(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
-NIXOPS_DEPLOYMENT  := maintenance
-mermet_disk        := $(shell sed -ne 's/^device: \(.*\)/\1/p' sfdisk.txt)
+mermet_deployment  := maintenance
+mermet_disk        := /dev/disk/by-id/ata-Samsung_SSD_840_EVO_250GB_S1DBNSAF340110R
 #mermet_cipher      :=
 mermet_cipher      := aes-128-gcm
 mermet_autotrim    :=
-mermet_reservation := 40G
+mermet_reservation := 1G
 #mermet_channel     := $$(nix-env -p /nix/var/nix/profiles/per-user/$$USER/channels -q nixpkgs --no-name --out-path)
 
 echo:
        echo $(MAKEFILES)
 
 wipeout: umount
-       sudo zpool labelclear -f $(mermet_disk)-part3 || true
+       #sudo zpool labelclear -f $(mermet_disk)-part3 || true
        sudo zpool labelclear -f $(mermet_disk)-part5 || true
        sudo $$(which sgdisk) --zap-all $(mermet_disk)
 
 partition:
        sudo modprobe zfs
-       sudo $$(which sfdisk) $(mermet_disk) <sfdisk.txt
-       sudo $$(which sgdisk) --randomize-guids $(mermet_disk)
-       sudo partprobe
+       set -x; if test -e sfdisk; then \
+               sudo $$(which sfdisk) $(losurdo_disk) <sfdisk.txt; \
+       else \
+               sudo $$(which sgdisk) --zap-all $(losurdo_disk) && \
+               sudo partprobe && \
+               sudo $$(which sgdisk) -a1 -n1:34:2047  -t1:EF02 $(losurdo_disk) && \
+               sudo $$(which sgdisk)     -n2:1M:+512M -t2:EF00 $(losurdo_disk) && \
+               sudo $$(which sgdisk)     -n3:0:+512M  -t3:8300 $(losurdo_disk) && \
+               sudo $$(which sgdisk)     -n4:0:+4G    -t4:8200 $(losurdo_disk) && \
+               sudo $$(which sgdisk)     -n5:0:0      -t5:BF01 $(losurdo_disk) && \
+               sudo $$(which sgdisk) --randomize-guids $(losurdo_disk) && \
+               sudo $$(which sfdisk) -d $(losurdo_disk) | \
+               sed -e 's&/dev/sd.&$(losurdo_disk)&' >sfdisk.txt; \
+       fi
 
 format:
        # DOC: https://github.com/zfsonlinux/zfs/wiki/Debian-Buster-Root-on-ZFS
@@ -65,7 +76,7 @@ format:
        # bpool
        
        # swap
-       # Note: configured with a volatile key in mermet.nix
+       # Note: configured with a volatile key in configuration.nix
        #blkid -t TYPE=crypto_LUKS $(mermet_disk)-part4; test $$? != 2 || \
        #sudo cryptsetup luksFormat --cipher aes-xts-plain64 --key-size 256 --hash sha256 $(mermet_disk)-part4
        #sudo cryptsetup luksOpen $(mermet_disk)-part4 swap
@@ -88,10 +99,13 @@ format:
         compression=lz4 \
         dnodesize=auto \
         relatime=on \
-        $(if $(mermet_reservation),reservation=$(mermet_reservation)) \
         xattr=sa \
         mountpoint=/ \
         rpool
+       # https://nixos.wiki/wiki/NixOS_on_ZFS#Reservations
+       sudo zfs list rpool/reserved 2>/dev/null || \
+       sudo zfs create -o canmount=off -o mountpoint=none rpool/reserved
+       sudo zfs set refreservation=$(mermet_reservation) rpool/reserved
        # /
        # NOTE: mountpoint=legacy is required to let NixOS mount the ZFS filesystems.
        sudo zfs list rpool/root 2>/dev/null || \
@@ -116,6 +130,7 @@ format:
         var/cache \
         var/log \
         var/mail \
+        var/redis \
         var/tmp \
         var/www \
         ; do \
@@ -169,6 +184,7 @@ mount:
         var/cache \
         var/log \
         var/mail \
+        var/redis \
         var/tmp \
         var/www \
         ; do \
@@ -180,7 +196,7 @@ mount:
 
 bootstrap: mount
        #test "$$(sudo grub-probe /mnt/mermet/boot)" = zfs
-       # NOTE: nixos-install will install GRUB following mermet.nix
+       # NOTE: nixos-install will install GRUB following configuration.nix
        # BIOS
        #sudo grub-install $(mermet_disk)
        # UEFI
@@ -200,10 +216,11 @@ bootstrap: mount
        sudo \
         GNUPGHOME="$$GNUPGHOME" \
         GPG_TTY="$$GPG_TTY" \
+        DBUS_SESSION_BUS_ADDRESS="$$DBUS_SESSION_BUS_ADDRESS" \
         LANG="$$LANG" \
         LC_CTYPE="$$LC_CTYPE" \
-        NIXOPS_DEPLOYMENT="$(NIXOPS_DEPLOYMENT)" \
-        NIXOS_CONFIG="$$(readlink -e ../mermet.nix)" \
+        MERMET_DEPLOYMENT="$$MERMET_DEPLOYMENT" \
+        NIXOS_CONFIG="$$(readlink -e ../configuration.nix)" \
         NIX_CONF_DIR="$$NIX_CONF_DIR" \
         NIX_PATH="$$NIX_PATH" \
         PASSWORD_STORE_DIR="$$PASSWORD_STORE_DIR" \
@@ -212,6 +229,7 @@ bootstrap: mount
         $$(which nixos-install) \
         --root /mnt/mermet \
         $(if $(mermet_channel),--channel "$(mermet_channel)") \
+        --option -Inixops=$$(nix-instantiate --eval -E '(import <nixpkgs> {}).nixops + ""') \
         --no-root-passwd \
         --show-trace
 
@@ -224,6 +242,7 @@ umount:
         var/cache \
         var/log \
         var/mail \
+        var/redis \
         var/tmp \
         var/www \
         var \
@@ -245,4 +264,5 @@ umount:
 
 unlock:
        pass servers/mermet/zfs/rpool | \
+       NIXOPS_DEPLOYMENT="$${NIXOPS_DEPLOYMENT:-$(MERMET_DEPLOYMENT)}" \
        nixops ssh mermet -p 2222 'zfs load-key rpool && pkill zfs'