diff options
| author | EuAndreh <eu@euandre.org> | 2025-04-04 17:15:24 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2025-04-04 17:22:40 -0300 |
| commit | ff1c9b84f3ee1ec3932dc0c6f81778dc12011955 (patch) | |
| tree | 78112861346e841c6e52d7a3c504c7c3d8e09aee | |
| parent | Makefile: Add $(PUBURL) variable (diff) | |
| download | euandre.org-ff1c9b84f3ee1ec3932dc0c6f81778dc12011955.tar.gz euandre.org-ff1c9b84f3ee1ec3932dc0c6f81778dc12011955.tar.xz | |
src/base.conf: Generate dynamic part dynamically
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | src/static.conf (renamed from src/base.conf) | 5 |
3 files changed, 19 insertions, 5 deletions
@@ -21,6 +21,7 @@ feed.xml /install.txt /email.txt /baseurl.txt +/fingerprint.txt /expiry.txt /src/content/security.txt /src/content/.well-known/security.txt @@ -126,6 +126,8 @@ derived-assets = \ $(sources.snippets) \ $(sources.snippets.gz) \ $(sources.conf) \ + src/dyn.conf \ + src/base.conf \ src/global.conf \ $(listings.htmlheader) \ $(listings.htmlfooter) \ @@ -135,6 +137,7 @@ derived-assets = \ $(articles.sortdata) \ email.txt \ baseurl.txt \ + fingerprint.txt \ expiry.txt \ src/content/security.txt \ src/content/security.txt.gz \ @@ -167,6 +170,16 @@ $(derived-assets): Makefile deps.mk $(sources.conf): src/global.conf src/headers.txt +src/dyn.conf: email.txt baseurl.txt fingerprint.txt + printf "export url_pre='%s'\n" "`cat baseurl.txt`" > $@ + printf "export email='%s'\n" "`cat email.txt`" >> $@ + printf "export publickey='%s'\n" "`cat fingerprint.txt`" >> $@ + printf "export publickey_url='$(PUBURL)'\n" >> $@ + printf 'export sourcecode_url="$url_pre/git/$(NAME)"\n' >> $@ + +src/base.conf: src/dyn.conf src/static.conf + cat src/dyn.conf src/static.conf > $@ + src/global.conf: src/base.conf mkwb conf -G src/base.conf > $@ @@ -193,6 +206,11 @@ email.txt: meta.json baseurl.txt: meta.json jq -r '.baseurl' < meta.json > $@ +fingerprint.txt: src/content/$(PUBURL) + gpg --always-trust --no-keyring --show-key --with-colons \ + src/content/$(PUBURL) | \ + awk -F: '/^pub:/ { print $$5 }' > $@ + expiry.txt: src/content/$(PUBURL) gpg --always-trust --no-keyring --show-key --with-colons \ src/content/$(PUBURL) | \ diff --git a/src/base.conf b/src/static.conf index 748365a..1007780 100644 --- a/src/base.conf +++ b/src/static.conf @@ -1,12 +1,7 @@ export root_dir=src/content export header_links=src/headers.txt -export url_pre='https://euandre.org' -export email='eu@euandre.org' -export publickey='81F90EC3CD356060' -export publickey_url='public.asc' export list_addr='~euandreh/public-inbox@lists.sr.ht' export discussions_url_prefix='https://lists.st.ht/~euandreh/public-inbox?search=' -export sourcecode_url='https://euandre.org/git/euandre.org' export sourcecode_url_prefix="$sourcecode_url/tree" export author='EuAndreh' export site_name="EuAndreh's website" |