aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2023-09-01 13:57:15 +0200
committerWojtek Kosior <koszko@koszko.org>2023-09-01 13:57:15 +0200
commitb659857f486ac1fe696c3d57c43a002cfb05b784 (patch)
tree070f2377823d06762c63a5e7151a01ebf9573e47
parentd5c529dab75a8be334f3fa659b10d515e21c8b88 (diff)
downloadkoszko-org-server-b659857f486ac1fe696c3d57c43a002cfb05b784.tar.gz
koszko-org-server-b659857f486ac1fe696c3d57c43a002cfb05b784.zip
Use user-configured Guix command/revision everywhere
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cbd2f49..524c437 100644
--- a/Makefile
+++ b/Makefile
@@ -120,11 +120,13 @@ prepare-test-root: sample-malcontent
chgrp 1001 $(LETSENCRYPT_ETC_DIR)/dummy-keys-and-stuff.txt
@# Prepare replacement `/etc/exim`
mkdir --mode=755 -p $(EXIM_ETC_DIR)
- guix shell openssl -- openssl genrsa -out $(EXIM_ETC_DIR)/dkim.pem 2048
+ $(GUIX_SHELL) openssl -- \
+ openssl genrsa -out $(EXIM_ETC_DIR)/dkim.pem 2048
chmod 640 $(EXIM_ETC_DIR)/dkim.pem
chown 106:113 $(EXIM_ETC_DIR)/dkim.pem
printf koszko: > $(EXIM_ETC_DIR)/passwd
- printf silnehaslo | guix shell whois -- mkpasswd --method=sha-256 -s \
+ printf silnehaslo | \
+ $(GUIX_SHELL) whois -- mkpasswd --method=sha-256 -s \
>> $(EXIM_ETC_DIR)/passwd
echo >> $(EXIM_ETC_DIR)/passwd
chmod 640 $(EXIM_ETC_DIR)/passwd