iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ae10fa0
)
minor fixes
author
Ian Kelling
<ian@iankelling.org>
Thu, 28 Apr 2022 03:18:48 +0000
(23:18 -0400)
committer
Ian Kelling
<ian@iankelling.org>
Thu, 28 Apr 2022 03:18:48 +0000
(23:18 -0400)
distro-begin
patch
|
blob
|
history
mail-setup
patch
|
blob
|
history
diff --git
a/distro-begin
b/distro-begin
index ef18bbd9020f6c5eb8f8fc1001f0f16790bc9eec..25247dceaeda29c128307ea2d0c96fddd64a746c 100755
(executable)
--- a/
distro-begin
+++ b/
distro-begin
@@
-319,13
+319,16
@@
if [[ ! -e $f ]]; then
sudo sed -i --follow-symlinks 's/^ *hosts:.*/hosts: files dns myhostname/' $f
fi
case $HOSTNAME in
sudo sed -i --follow-symlinks 's/^ *hosts:.*/hosts: files dns myhostname/' $f
fi
case $HOSTNAME in
- bk)
+ bk|je)
+ # je should be able to get along systemd-resolved, but ive had some odd
+ # very intermittent dns failures with spamassassin, it seems it might only
+ # be happening with systemd-resolved, so just use unbound
+ # to make it consistent with the other hosts.
sudo sed -i --follow-symlinks 's/^ *hosts:.*/hosts: files dns myhostname/' /etc/nsswitch.conf
soff systemd-resolved
sudo ln -sf 127.0.0.1-resolv/stub-resolv.conf /etc/resolv.conf
sgo unbound
sudo sed -i --follow-symlinks 's/^ *hosts:.*/hosts: files dns myhostname/' /etc/nsswitch.conf
soff systemd-resolved
sudo ln -sf 127.0.0.1-resolv/stub-resolv.conf /etc/resolv.conf
sgo unbound
- sgo named
- # cautious measure to make sure bind is up
+ # cautious measure to make sure resolution is working
sleep 1
;;
*)
sleep 1
;;
*)
@@
-340,6
+343,13
@@
case $HOSTNAME in
;;
esac
;;
esac
+case $HOSTNAME in
+ bk)
+ sgo named
+ ;;
+esac
+
+
f=/etc/apparmor.d/abstractions/nameservice
if [[ -e $f ]] && ! grep -q /etc/resolved-nsswitch/nsswitch.conf $f; then
sudo sed -i '/\/etc\/nsswitch.conf/a /etc/resolved-nsswitch/nsswitch.conf r,' $f
f=/etc/apparmor.d/abstractions/nameservice
if [[ -e $f ]] && ! grep -q /etc/resolved-nsswitch/nsswitch.conf $f; then
sudo sed -i '/\/etc\/nsswitch.conf/a /etc/resolved-nsswitch/nsswitch.conf r,' $f
diff --git
a/mail-setup
b/mail-setup
index d3d1056e3d336bf6746591ff58f5caab6d977e7d..abd863370b1b04440f6df6ed6a32d3f704d0f344 100755
(executable)
--- a/
mail-setup
+++ b/
mail-setup
@@
-287,7
+287,8
@@
i() { # install file
local base="${dest##*/}"
local dir="${dest%/*}"
if [[ $dir != "$base" ]]; then
local base="${dest##*/}"
local dir="${dest%/*}"
if [[ $dir != "$base" ]]; then
- mkdir -p ${dest%/*}
+ # dest has a directory component
+ mkdir -p "$dir"
fi
ir=false # i result
tmpdir=$(mktemp -d)
fi
ir=false # i result
tmpdir=$(mktemp -d)