tons of misc updates

[distro-setup] / conflink

diff --git a/conflink b/conflink
index ec1b6238261cd98b135325f66a8a01580461f7fe..4e62edbcc39469d44b66336ba1dbff81321f094a 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -1,13 +1,10 @@
 #!/bin/bash
 
-source /a/bin/errhandle/errcatch-function
-source /a/bin/errhandle/bash-trace-function
-
-errcatch
+source /a/bin/errhandle/err
 
 m() {
-    echo "$*"
-    "$@"
+  echo "$*"
+  "$@"
 }
 s() { sudo "$@"; }
 lnf() { /a/exe/lnf "$@"; }
@@ -22,88 +19,87 @@ shopt -s extglob # note, already set with bash -l
 # Also note, under filesystem/, symlinks are expanded.
 
 subdir-link-r() {
-    local root="$1"
-    local targets=()
-    if [[ $2 ]]; then
-        targets=( "$2"/!(.git|..|.) )
-    else
-        for f in "$1"/!(.git|..|.); do
-            [[ -d $f ]] && targets+=("$f") ||:
-        done
-    fi
-    local below="$( readlink -f "$root/..")"
-    for path in "${targets[@]}"; do
-        local fullpath="$(readlink -f "$path")"
-        #e $fullpath $below # debug
-        if [[ -f $path || $(dirname $(readlink -f "$fullpath")) == "$below" ]]; then
-            m lnf -T "$path" "$HOME/${path#$root/}"
-        elif [[ -d "$path" ]]; then
-            subdir-link-r "$root" "$path"
-        fi
+  local root="$1"
+  local targets=()
+  if [[ $2 ]]; then
+    targets=( "$2"/!(.git|..|.) )
+  else
+    for f in "$1"/!(.git|..|.); do
+      [[ -d $f ]] && targets+=("$f") ||:
     done
+  fi
+  local below="$( readlink -f "$root/..")"
+  for path in "${targets[@]}"; do
+    local fullpath="$(readlink -f "$path")"
+    #e $fullpath $below # debug
+    if [[ -f $path || $(dirname $(readlink -f "$fullpath")) == "$below" ]]; then
+      m lnf -T "$path" "$HOME/${path#$root/}"
+    elif [[ -d "$path" ]]; then
+      subdir-link-r "$root" "$path"
+    fi
+  done
 }
 
 
 
 common-file-setup() {
-    local dir fs x bdir f dst
-    for dir in "$@"; do
-        fs=$dir/filesystem
-        if [[ -e $fs && $USER =~ ^iank?$ ]]; then
-            # note, symlinks get resolved, not copied.
-            s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
-        fi
-
-        if [[ -e $dir/subdir_files ]]; then
-            m subdir-link-r $dir/subdir_files
-        fi
-        local x=( $dir/!(binds|subdir_files|filesystem|machine_specific|..|.) )
-        (( ${#x[@]} >= 1 )) || continue
-        m lnf ${x[@]} ~
-    done
+  local dir fs x bdir f dst
+  for dir in "$@"; do
+    fs=$dir/filesystem
+    if [[ -e $fs && $USER =~ ^iank?$ ]]; then
+      # note, symlinks get resolved, not copied.
+      s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
+    fi
+
+    if [[ -e $dir/subdir_files ]]; then
+      m subdir-link-r $dir/subdir_files
+    fi
+    local x=( $dir/!(binds|subdir_files|filesystem|machine_specific|..|.) )
+    (( ${#x[@]} >= 1 )) || continue
+    m lnf ${x[@]} ~
+  done
 }
 
 all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
 # note, we assume a group of hosts does not have the
 # same name as a single host, which is no problem on our scale.
 for x in /p/c/machine_specific/*.hosts; do
-    if grep -qxF $HOSTNAME $x; then all_dirs+=( ${x%.hosts} ); fi
+  if grep -qxF $HOSTNAME $x; then all_dirs+=( ${x%.hosts} ); fi
 done
 
 c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
 case $USER in
-    ian|iank)
-        # p needs to go first so .ssh link is created, then config link inside it
-        m common-file-setup ${all_dirs[@]}
-
-        #### begin special extra stuff ####
-        install -d -m700 ~/gpg-agent-socket
-        if [[ -d /etc/bind/bind-writable ]]; then
-            # need bind writable dir for nsupdate, or else we get
-            # named[20823]: /etc/bind/db.iank.pw.jnl: create: permission denied
-            m s chgrp bind /etc/bind/bind-writable
-        fi
-        files=(/etc/bind/[Kk]*)
-        if [[ -e $files ]]; then
-            m s chgrp bind ${files[@]}
-        fi
-        if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
-            s chgrp www-data /etc/davpass
-        fi
-        if [[ -e /var/lib/znc ]] && getent group znc; then
-          s chown -R znc:znc /var/lib/znc
-        fi
-        /a/exe/lnf -T /p/arbtt-capture.log ~/.arbtt/capture.log
-        ##### end special extra stuff #####
-
-        sudo bash -c 'cd /etc/openvpn; for f in client/*; do ln -sf $f .; done'
-
-        m sudo -H -u traci "$BASH_SOURCE"
-        ;;
-    traci)
-        m common-file-setup ${c_dirs[@]}
-        ;;
-    *)
-        echo "$0: error: unexpected user"; exit 1
-        ;;
+  ian|iank)
+    # p needs to go first so .ssh link is created, then config link inside it
+    m common-file-setup ${all_dirs[@]}
+
+    #### begin special extra stuff ####
+    install -d -m700 ~/gpg-agent-socket
+
+    files=(/var/lib/bind)
+    if [[ -e $files ]]; then
+      # reset to the original permissions.
+      m s chgrp -R bind ${files[@]}
+      m s chmod g+w ${files[@]}
+    fi
+    if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
+      s chgrp www-data /etc/davpass
+    fi
+    if [[ -e /var/lib/znc ]] && getent group znc; then
+      s chown -R znc:znc /var/lib/znc
+    fi
+    /a/exe/lnf -T /p/arbtt-capture.log ~/.arbtt/capture.log
+    ##### end special extra stuff #####
+
+    sudo bash -c 'cd /etc/openvpn; for f in client/*; do ln -sf $f .; done'
+    sudo bash -c 'chmod 600 /etc/openvpn/client/*.key'
+
+    m sudo -H -u traci "$BASH_SOURCE"
+    ;;
+  traci)
+    m common-file-setup ${c_dirs[@]}
+    ;;
+  *)
+    echo "$0: error: unexpected user"; exit 1
+    ;;
 esac