summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2024-08-21 14:24:32 -0300
committerEuAndreh <eu@euandre.org>2024-08-21 15:03:50 -0300
commitd8e167c9b044cb3ae2b7afdffdc86be21c1a2fb8 (patch)
treee99dfb4fad7b5a1d4f4f77806152432d6c97b1e3
parentmv src/tld.txt src/config/ (diff)
downloadasami-d8e167c9b044cb3ae2b7afdffdc86be21c1a2fb8.tar.gz
asami-d8e167c9b044cb3ae2b7afdffdc86be21c1a2fb8.tar.xz
src/config/offsite-ssh.txt: Derive from Makefile and include in /etc/
-rw-r--r--Makefile7
-rw-r--r--src/config/offsite-ssh.txt1
-rw-r--r--src/guix/system.scm9
3 files changed, 13 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a18ee22..8dbb6dc 100644
--- a/Makefile
+++ b/Makefile
@@ -39,10 +39,13 @@ all: $(derived-assets)
$(derived-assets): Makefile
src/config/tld.txt: Makefile
- echo '$(TLD)' > $@
+ echo '$(TLD)' | ifnew $@
+
+src/config/offsite-ssh.txt: Makefile
+ echo '$(OFFSITE_SSH)' | ifnew $@
packages.scm.sentinel: src/guix/packages.scm
-system.scm.sentinel: src/guix/packages.scm src/guix/system.scm src/config/tld.txt
+system.scm.sentinel: src/guix/packages.scm src/guix/system.scm src/config/tld.txt src/config/offsite-ssh.txt
packages.scm.sentinel system.scm.sentinel:
rm -f `basename $@ .sentinel`*
guix build -v3 -r`basename $@ .sentinel` -Kf src/guix/`basename $@ .sentinel`
diff --git a/src/config/offsite-ssh.txt b/src/config/offsite-ssh.txt
new file mode 100644
index 0000000..8933e9d
--- /dev/null
+++ b/src/config/offsite-ssh.txt
@@ -0,0 +1 @@
+zh4539@zh4539.rsync.net
diff --git a/src/guix/system.scm b/src/guix/system.scm
index f6e2948..bad1348 100644
--- a/src/guix/system.scm
+++ b/src/guix/system.scm
@@ -45,6 +45,10 @@
((compose pkg:slurp path)
"src/config/known-hosts.txt"))
+(define +offsite-ssh+
+ ((compose pkg:slurp path)
+ "src/config/offsite-ssh.txt"))
+
(define +cert.pem+ (pkg:str "/etc/letsencrypt/live/" +tld+ "/cert.pem"))
(define +privkey.pem+ (pkg:str "/etc/letsencrypt/live/" +tld+ "/privkey.pem"))
@@ -116,8 +120,9 @@
(service q:cyrus-sasl-service-type)
(service q:dovecot-service-type)
(service q:internet-postfix-service-type)
- (simple-service 'known-hosts-etc-file etc-service-type
- `(("known_hosts" ,(plain-file "known-hosts.txt" +known-hosts+))))
+ (simple-service 'host-specific-etc-file etc-service-type
+ `(("known_hosts" ,(plain-file "known-hosts.txt" +known-hosts+))
+ ("offsite-ssh.txt" ,(plain-file "offsite-ssh.txt" +offsite-ssh+))))
(service mail-aliases-service-type
`(("root" "andre")
("support" ,@(map s1:first +users+)))))