X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/792c84b966ae1ce7df9bc8c1837e5b9bb859c4a2..d4fd47c01e109a15c3babeb63a6871cb244d5115:/scripts/domtool-publish

diff --git a/scripts/domtool-publish b/scripts/domtool-publish
index 0f75802..94bf9b1 100755
--- a/scripts/domtool-publish
+++ b/scripts/domtool-publish
@@ -1,7 +1,17 @@
 #!/bin/sh -e
 
+# grab tokens in case they were dropped by sudo
+if [ -x "$(which aklog)" ]; then
+    # ignore exit code, may fail on older versions
+    aklog || true
+fi
+
 redo_exim() {
-        sudo -u domtool touch /var/domtool/local_domains.cfg /var/domtool/relay_domains.cfg /var/domtool/mailman_domains.cfg
+        # FIXME: we're ignoring status of the touch command because we
+        # had to set mailman_domains.cfg immutable on mail relays not
+        # running mailman due to deficiencies on the domtool mailman
+        # plugin. Needs to be removed when not needed...
+        sudo -u domtool touch /var/domtool/local_domains.cfg /var/domtool/relay_domains.cfg /var/domtool/mailman_domains.cfg || true
 	/bin/echo -n "domainlist local_domains = " >/etc/exim4/conf.d/main/10_domtool-domains
 	/bin/cat /var/domtool/local_domains.cfg >>/etc/exim4/conf.d/main/10_domtool-domains
 	/bin/echo "" >>/etc/exim4/conf.d/main/10_domtool-domains