src

commit 94da83981d0736b407eba62e2962520f96eb65cc
parent a6a43516ccb009df8ac599cbdacf4164a654bc84
author: nathanael <nathanael@dalliard.ch>
date:   Fri, 17 Oct 2025 17:52:33 +0000

s1: add bin sieve

diffstat:
A
s1/dotfiles/bin/sieve
 | 
6
++++++
M
s1/makefile
 | 
6
------
M
s1/scripts/sysfiles.sh
 | 
2
--

3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/s1/dotfiles/bin/sieve b/s1/dotfiles/bin/sieve
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+"$EDITOR" "$HOME/prv/sieve" && {
+	doas install -o root -g wheel -m 644 "$HOME/prv/sieve" \
+		"/etc/dovecot/sieve/default.sieve"
+	doas sievec /etc/dovecot/sieve/default.sieve
+}
diff --git a/s1/makefile b/s1/makefile
@@ -11,12 +11,6 @@ dots: host
 
 sys: host
 	@./scripts/sysfiles.sh
-	@$(MAKE) sieve
-
-sieve:
-	@if [ -f /etc/dovecot/sieve/default.sieve ]; then \
-		doas sievec /etc/dovecot/sieve/default.sieve; \
-	fi
 
 cron: host
 	@./scripts/cronjobs.sh
diff --git a/s1/scripts/sysfiles.sh b/s1/scripts/sysfiles.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 src="$HOME/src/src/s1/sysfiles"
 
-doas install -d -o root -g wheel -m 755 "/etc/dovecot/sieve/"
 doas install -d -o root -g www -m 755 "/var/www/go/"
 doas install -d -o root -g www -m 755 "/var/www/ln/"
 doas install -d -o root -g www -m 755 "/var/www/mail/"
@@ -9,7 +8,6 @@ doas install -d -o root -g www -m 777 "/var/www/tmp/"
 doas install -o root -g wheel -m 600 "$src/pf.conf" "/etc/pf.conf"
 doas install -o root -g wheel -m 600 "$src/relayd.conf" "/etc/relayd.conf"
 doas install -o root -g wheel -m 640 "$src/doas.conf" "/etc/doas.conf"
-doas install -o root -g wheel -m 644 "$HOME/prv/sieve" "/etc/dovecot/sieve/default.sieve"
 doas install -o root -g wheel -m 644 "$src/acme-client.conf" "/etc/acme-client.conf"
 doas install -o root -g wheel -m 644 "$src/aliases" "/etc/mail/aliases"
 doas install -o root -g wheel -m 644 "$src/daily.local" "/etc/daily.local"