summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile14
-rw-r--r--src/config/conf.env16
-rw-r--r--src/config/tld.txt1
-rw-r--r--src/guix/system.scm2
5 files changed, 21 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 050724b..d7a8842 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,3 @@
/public/
/*.sentinel
/src/secrets/*.txt
-/src/config/conf.env
-/tld.txt
diff --git a/Makefile b/Makefile
index b8c88e4..0078084 100644
--- a/Makefile
+++ b/Makefile
@@ -45,12 +45,7 @@ prod-secrets.txt = $(prod-secrets.txt.gpg:.gpg=)
all-secrets.txt = $(all-secrets.txt.gpg:.gpg=)
-generated-assets = \
- tld.txt \
- src/config/conf.env \
-
derived-assets = \
- $(generated-assets) \
mkdir-public.sentinel \
system.sentinel \
public \
@@ -59,18 +54,15 @@ derived-assets = \
-
all: $(derived-assets)
-gen: $(generated-assets)
-
-$(derived-assets): Makefile
+$(derived-assets) src/config/tld.txt src/config/conf.env: Makefile
-tld.txt:
+src/config/tld.txt:
echo '$(TLD)' > $@
-system.sentinel: src/guix/system.scm tld.txt \
+system.sentinel: src/guix/system.scm src/config/tld.txt src/config/conf.env \
src/keys/SSH/root@$(URL).id_rsa.pub.stripped
guix build -v3 -f src/guix/system.scm
touch $@
diff --git a/src/config/conf.env b/src/config/conf.env
new file mode 100644
index 0000000..b60173e
--- /dev/null
+++ b/src/config/conf.env
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+NAME='papo.im'
+TLD='papo.im'
+URL='papo.im'
+OFFSITE_SSH='00000@aa0000.rsync.net'
+OUT_SUFFIX=''
+PRIV_SUFFIX=''
+CI_SUFFIX="ci"
+
+HTML_OUTDIR_TOP="/srv/www/$OUT_SUFFIX"
+HTML_OUTDIR_PRIV="$HTML_OUTDIR_TOP$PRIV_SUFFIX"
+HTML_OUTDIR_CI="$HTML_OUTDIR_TOP/$CI_SUFFIX"
+HOMEPAGE="https://$TLD/$OUT_SUFFIX/"
+CGIT_URL="https://$TLD/git/$NAME/commit/?id="
+REPO_NAME="$NAME.git"
diff --git a/src/config/tld.txt b/src/config/tld.txt
new file mode 100644
index 0000000..c3550c8
--- /dev/null
+++ b/src/config/tld.txt
@@ -0,0 +1 @@
+papo.im
diff --git a/src/guix/system.scm b/src/guix/system.scm
index 5e16737..53c5922 100644
--- a/src/guix/system.scm
+++ b/src/guix/system.scm
@@ -46,7 +46,7 @@
(define +tld+
(string-trim-right
- (slurp (path "tld.txt"))))
+ (file "src/config/tld.txt")))
(define +ipv4+ "216.238.73.1")
(define +ipv6+ "2001:19f0:b400:1582:5400:04ff:fea9:370e")