From 66e057a4ed2d1f33c5e02cc8f6f2cc36137ba53d Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 24 Nov 2022 18:38:27 -0300 Subject: Revert "Revert "Move email, IRC and Atom into Thunderbird"" This reverts commit 3dcbe37baab74e089dee6f93d74a8824f5591478. The Postfix local server is still a bit janky and being worked on, now can be used to replace the previous email toolchain. --- Makefile | 53 +++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9907b46..304a780 100644 --- a/Makefile +++ b/Makefile @@ -14,22 +14,17 @@ lisp-images = \ derived-assets = \ $(pod2man) \ $(XDG_CONFIG_HOME)/ssh/id_rsa.pub \ - $(XDG_CONFIG_HOME)/git/config-extra \ $(XDG_CONFIG_HOME)/gnupg/gpg-agent.conf \ - $(XDG_CONFIG_HOME)/remhind/config \ $(XDG_CONFIG_HOME)/ssh/config \ - $(XDG_CONFIG_HOME)/alot/config \ - $(XDG_CONFIG_HOME)/mbsync/config \ - $(XDG_CONFIG_HOME)/msmtp/config \ - $(XDG_CONFIG_HOME)/notmuch/default/config \ - $(XDG_CONFIG_HOME)/notmuch/default/hooks/post-new \ - $(XDG_DATA_HOME)/euandreh/mailcfg-accounts.txt \ $(XDG_DATA_HOME)/common-lisp/source \ $(XDG_DATA_HOME)/euandreh/e.list.txt \ + $(PRIV_STATEDIR)/postfix/relayhosts-maps.db \ + $(PRIV_STATEDIR)/postfix/sasl-password.db \ $(lisp-images) all: $(derived-assets) + cd $(PRIV_CONFIG) && $(MAKE) $@ share/man/man1/x.1: bin/x @@ -41,39 +36,13 @@ share/man/man1/z.1: bin/z $(XDG_DATA_HOME)/common-lisp/source: ln -s $(SRC)/libre $@ -$(XDG_CONFIG_HOME)/alot/config: bin/mailcfg - mailcfg alot > $@ - -$(XDG_CONFIG_HOME)/mbsync/config: bin/mailcfg - mailcfg mbsync > $@ - -$(XDG_CONFIG_HOME)/msmtp/config: bin/mailcfg - mailcfg msmtp > $@ - -$(XDG_CONFIG_HOME)/notmuch/default/config: bin/mailcfg - mailcfg notmuchcfg > $@ - -$(XDG_CONFIG_HOME)/notmuch/default/hooks/post-new: bin/mailcfg - mailcfg notmuchhook > $@ - chmod +x $@ - -$(XDG_DATA_HOME)/euandreh/mailcfg-accounts.txt: bin/mailcfg - mailcfg list > $@ - $(XDG_CONFIG_HOME)/ssh/id_rsa.pub: gpg --export-ssh-key eu@euandre.org > $@ chmod 600 $@ -$(XDG_CONFIG_HOME)/remhind/config: $(XDG_CONFIG_HOME)/remhind/config.tmpl - envsubst < $(XDG_CONFIG_HOME)/remhind/config.tmpl > $@ - $(XDG_CONFIG_HOME)/ssh/config: $(XDG_CONFIG_HOME)/ssh/config.tmpl envsubst < $(XDG_CONFIG_HOME)/ssh/config.tmpl > $@ -$(XDG_CONFIG_HOME)/git/config-extra: - printf '[sendemail]\n smtpserver = ' > $@ - command -v msmtpq >> $@ - $(XDG_CONFIG_HOME)/gnupg/gpg-agent.conf: $(XDG_CONFIG_HOME)/gnupg/gpg-agent.conf.tmpl cp $(XDG_CONFIG_HOME)/gnupg/gpg-agent.conf.tmpl $@ printf 'pinentry-program ' >> $@ @@ -82,6 +51,12 @@ $(XDG_CONFIG_HOME)/gnupg/gpg-agent.conf: $(XDG_CONFIG_HOME)/gnupg/gpg-agent.conf $(XDG_DATA_HOME)/euandreh/e.list.txt: ~/Documents/txt/ opt/aux/gen-e-list.sh sh opt/aux/gen-e-list.sh > $@ +$(PRIV_STATEDIR)/postfix/relayhosts-maps.db $(PRIV_STATEDIR)/postfix/sasl-password.db: + postmap $(@D)/`basename $@ .db` + +$(PRIV_STATEDIR)/postfix/sasl-password.db: $(PRIV_STATEDIR)/postfix/sasl-password +$(PRIV_STATEDIR)/postfix/relayhosts-maps.db: $(PRIV_STATEDIR)/postfix/relayhosts-maps + $(lisp-images): $(XDG_CONFIG_HOME)/lisp-cli/init.lisp bin/cl bin/li I=`echo $@ | awk -F/ '$$0=$$(NF)' | cut -d. -f1` && \ li -vI $$I -E "(format t \"Image for \\\"$$I\\\" created.~%\")" @@ -135,8 +110,14 @@ check-sync: exit 1; \ fi -check: check-shellcheck check-perlcritic check-fixme check-dirty-public \ - check-dirty-private check-opt check-pod check-sync +check-services: + # LANG=en_US.UTF-8 herd status poweralertd | awk 'NR == 2 { if ($0 != " It is started.") { print "poweralertd not running."; exit 1 } }' + +check: check-shellcheck check-perlcritic check-fixme check-dirty-public \ + check-dirty-private check-opt check-pod check-sync \ + check-services \ + cd $(PRIV_CONFIG) && $(MAKE) $@ clean: rm -f $(derived-assets) + cd $(PRIV_CONFIG) && $(MAKE) $@ -- cgit v1.2.3