shorewall: open fw2net IRCS

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

diff --git a/servers/mermet/Makefile b/servers/mermet/Makefile
index d59d6964394af7ecd04706d844836cc1ed00ff09..1f78b34d5b6f70eaf2847b831a62b509f81e5e5b 100644 (file)
--- a/servers/mermet/Makefile
+++ b/servers/mermet/Makefile
@@ -1,6 +1,6 @@
 #cwd := $(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
 NIXOPS_DEPLOYMENT  := maintenance
-mermet_disk        := $(shell sed -ne 's/^device: \(.*\)/\1/p' machine/sfdisk.txt)
+mermet_disk        := $(shell sed -ne 's/^device: \(.*\)/\1/p' sfdisk.txt)
 #mermet_cipher      :=
 mermet_cipher      := aes-128-gcm
 mermet_autotrim    :=
@@ -17,7 +17,7 @@ wipeout: umount
 
 partition:
        sudo modprobe zfs
-       sudo $$(which sfdisk) $(mermet_disk) <machine/sfdisk.txt
+       sudo $$(which sfdisk) $(mermet_disk) <sfdisk.txt
        sudo $$(which sgdisk) --randomize-guids $(mermet_disk)
        sudo partprobe
 
@@ -112,11 +112,11 @@ format:
        for p in \
         home \
         nix \
-        nix/var \
         var \
         var/cache \
         var/log \
         var/mail \
+        var/redis \
         var/tmp \
         var/www \
         ; do \
@@ -129,9 +129,6 @@ format:
        sudo zfs set \
         com.sun:auto-snapshot=false \
         rpool/nix
-       sudo zfs set \
-        sync=always \
-        rpool/nix/var
        sudo zfs set \
         com.sun:auto-snapshot=false \
         rpool/var/cache
@@ -169,11 +166,11 @@ mount:
        for p in \
         home \
         nix \
-        nix/var \
         var \
         var/cache \
         var/log \
         var/mail \
+        var/redis \
         var/tmp \
         var/www \
         ; do \
@@ -225,11 +222,11 @@ umount:
         boot/efi \
         boot \
         home \
-        nix/var \
         nix \
         var/cache \
         var/log \
         var/mail \
+        var/redis \
         var/tmp \
         var/www \
         var \