unbound: enable unbound-control locally

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

diff --git a/servers/mermet/Makefile b/servers/mermet/Makefile
index dd4e0b5d9e9ad661ffc22111f0b797bbd6a24e3c..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
 
@@ -116,6 +116,7 @@ format:
         var/cache \
         var/log \
         var/mail \
+        var/redis \
         var/tmp \
         var/www \
         ; do \
@@ -169,6 +170,7 @@ mount:
         var/cache \
         var/log \
         var/mail \
+        var/redis \
         var/tmp \
         var/www \
         ; do \
@@ -224,6 +226,7 @@ umount:
         var/cache \
         var/log \
         var/mail \
+        var/redis \
         var/tmp \
         var/www \
         var \