From 139d7dbc15f4467201c24af834a574f19a5926b4 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 27 Nov 2022 18:46:01 -0300 Subject: Build TODOs.html on "public" target --- .gitignore | 1 + Makefile | 21 +++++++++-- src/doc/favicon.svg | 62 ++++++++++++++++++++++++++++++++ src/doc/head.html | 2 ++ src/doc/md2html.sh | 73 ++++++++++++++++++++++++++++++++++++++ src/infrastructure/guix/system.scm | 23 +++++++++--- 6 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 src/doc/favicon.svg create mode 100644 src/doc/head.html create mode 100755 src/doc/md2html.sh diff --git a/.gitignore b/.gitignore index f1652b1..4a4015c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /public/ /*.log /vendor/ +/.sentinel/ diff --git a/Makefile b/Makefile index 51e4704..38ec1a5 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,14 @@ .POSIX: -all: +all: public check: clean: - rm -rf public/ + rm -rf \ + .sentinel/ public/ dev-check: check @@ -19,3 +20,19 @@ deploy: src/infrastructure/guix/system.scm \ toph:/etc/guix/ ssh toph reconfigure + + +.sentinel/mkdir-public: + mkdir -p public .sentinel + touch $@ + +public/favicon.svg: .sentinel/mkdir-public src/doc/favicon.svg + cp src/doc/favicon.svg $@ + +public/style.css: .sentinel/mkdir-public + td -S > $@ + +public/TODOs.html: .sentinel/mkdir-public TODOs.md + td -H | sh src/doc/md2html.sh -T TODOs > $@ + +public: public/favicon.svg public/style.css public/TODOs.html diff --git a/src/doc/favicon.svg b/src/doc/favicon.svg new file mode 100644 index 0000000..ce566b2 --- /dev/null +++ b/src/doc/favicon.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/doc/head.html b/src/doc/head.html new file mode 100644 index 0000000..3902690 --- /dev/null +++ b/src/doc/head.html @@ -0,0 +1,2 @@ + + diff --git a/src/doc/md2html.sh b/src/doc/md2html.sh new file mode 100755 index 0000000..12865da --- /dev/null +++ b/src/doc/md2html.sh @@ -0,0 +1,73 @@ +#!/bin/sh +set -eu + + +usage() { + cat <<-'EOF' + Usage: + md2html.sh -T TITLE [-D TOC_DEPTH] < FILE.md + md2html.sh -h + EOF +} + +help() { + cat <<-'EOF' + + Options: + -T TITLE the required title of the generated HTML + document + -D TOC_DEPTH the depth of the generated table of + contents (default: 2) + -h, --help show this message + + + Read markdown text from STDIN and emit HTML to STDOUT. + EOF +} + +for flag in "$@"; do + case "$flag" in + --) + break + ;; + --help) + usage + help + exit + ;; + *) + ;; + esac +done + +TOC_DEPTH=2 +while getopts 'T:D:h' flag; do + case "$flag" in + T) + TITLE="$OPTARG" + ;; + D) + TOC_DEPTH="$OPTARG" + ;; + h) + usage + help + exit + ;; + *) + usage >&2 + exit 2 + ;; + esac +done +shift $((OPTIND - 1)) + +eval "$(assert-arg "${TITLE:-}" '-T TITLE')" + +pandoc \ + -s \ + --toc \ + --toc-depth="$TOC_DEPTH" \ + --metadata lang=en \ + --metadata title="$TITLE" \ + -H src/doc/head.html diff --git a/src/infrastructure/guix/system.scm b/src/infrastructure/guix/system.scm index 83edc1a..6218583 100644 --- a/src/infrastructure/guix/system.scm +++ b/src/infrastructure/guix/system.scm @@ -1060,8 +1060,14 @@ smtp_tls_cert_file = $smtpd_tls_cert_file smtp_tls_key_file = $smtpd_tls_key_file - smtpd_tls_security_level = may smtp_tls_security_level = may + + recipient_delimiter = + + + # smtpd_sasl_security_options = FIXME: deny all + smtpd_sasl_tls_security_options = noanonymous + # FIXME: shouldn't this be "encrypt"? + smtpd_tls_security_level = may smtpd_tls_auth_only = yes smtpd_relay_restrictions = $smtpd_recipient_restrictions @@ -1314,6 +1320,9 @@ mail_location = maildir:~~/Mail:INBOX=~~/Mail/Inbox:LAYOUT=fs + # FIXME: + # mail_plugins + namespace inbox { inbox = yes @@ -1824,7 +1833,14 @@ fastcgi_param HTTP_HOST $server_name; fastcgi_pass 127.0.0.1:9000; rewrite /git(.*) $1 break; - "#)))))))))) + "#))) + (nginx-location-configuration + (uri "/r/velhinho/") + (body + '(#"- + rewrite /r/velhinho(.*) $1 break; + proxy_pass http://velhinho:4219; + "#)))))))))) (simple-service 'create-/srv/www activation-service-type #~(begin (use-modules (guix build utils)) @@ -1898,11 +1914,10 @@ (format #f #"- canonical_maps = inline:{ ~a=~a } - alias_database = inline:{ @~a=~a } + alias_database = static:~a "# whoami public-me - tld public-me)))) (service mail-aliases-service-type `(("root" ,whoami) -- cgit v1.2.3