iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shellcheck, better automated upgrades
[distro-setup]
/
mail-setup
diff --git
a/mail-setup
b/mail-setup
index b97f3b929a5fd4f1f16105d9c8bcadf8c66951e5..93d09c739402f2c4b8c78c7b79aa22641b228f5b 100755
(executable)
--- a/
mail-setup
+++ b/
mail-setup
@@
-21,7
+21,7
@@
set -x
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-[[ $EUID == 0 ]] || exec sudo -E "$
BASH_SOURCE
" "$@"
+[[ $EUID == 0 ]] || exec sudo -E "$
{BASH_SOURCE[0]}
" "$@"
if [[ ! $SUDO_USER ]]; then
echo "$0: error: requires running as nonroot or sudo"
exit 1
if [[ ! $SUDO_USER ]]; then
echo "$0: error: requires running as nonroot or sudo"
exit 1
@@
-345,7
+345,7
@@
cat >$f <<'EOF'
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-[[ $EUID == 0 ]] || exec sudo
"$BASH_SOURCE
" "$@"
+[[ $EUID == 0 ]] || exec sudo
-E "${BASH_SOURCE[0]}
" "$@"
f=/a/bin/bash_unpublished/source-state
if [[ -e $f ]]; then
f=/a/bin/bash_unpublished/source-state
if [[ -e $f ]]; then
@@
-398,11
+398,6
@@
systemctl start mailcert
systemctl restart mailcert.timer
systemctl enable mailcert.timer
systemctl restart mailcert.timer
systemctl enable mailcert.timer
-# This symlink is only here to so I can use the
-# fsf mailman ansible role and trick its cert script
-# into doing nothing.
-/a/exe/lnf -T /etc/exim4/exim.crt /etc/letsencrypt/live/$(hostname -f)/fullchain.pem
-
##### end mailcert setup #####
# comon stuff
##### end mailcert setup #####
# comon stuff