updates, especially for etiona

[distro-setup] / conflink

diff --git a/conflink b/conflink
index e26be58e0693af8d3ce3ddb9e84bdba8a8e1f636..69b6a6eca005592194ebe2f8c22691527e9a7005 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -1,17 +1,47 @@
 #!/bin/bash
 
 source /a/bin/errhandle/err
+err-cleanup() {
+  echo 1 >~/.local/conflink
+}
+
+
+usage() {
+  cat <<EOF
+Usage: ${0##*/} [OPTIONS]
+Link or otherwise install configuration files.
+
+-f   For fast. Dont use lnf, use ln -sf. Good for updating existing files.
+EOF
+  exit $1
+}
+
 
 m() {
   echo "$*"
   "$@"
 }
 s() { sudo "$@"; }
+
 lnf() { /a/exe/lnf "$@"; }
 
+fast=false
+if [[ $1 == -f ]]; then # f for fast
+  fast=true
+  shift
+elif
+  [[ $1 ]]; then
+  echo "error: unrecognized arguments" >&2
+  exit 0
+fi
+
+if $fast; then
+  lnf() { ln -sf "$@"; }
+fi
 
 shopt -s nullglob
-shopt -s extglob # note, already set with bash -l
+shopt -s extglob
+shopt -s dotglob
 
 # If we make a link back to the root, we stop going deeper into subdir_files.
 # This makes it so we can do subdir directories.
@@ -25,12 +55,14 @@ subdir-link-r() {
     targets=( "$2"/!(.git|..|.) )
   else
     for f in "$1"/!(.git|..|.); do
-      [[ -d $f ]] && targets+=("$f") ||:
+      if [[ -d $f ]]; then targets+=("$f"); fi
     done
   fi
-  local below="$( readlink -f "$root/..")"
+  local below
+  below="$( readlink -f "$root/..")"
   for path in "${targets[@]}"; do
-    local fullpath="$(readlink -f "$path")"
+    local fullpath
+    fullpath="$(readlink -f "$path")"
     #e $fullpath $below # debug
     if [[ -f $path || $(dirname $(readlink -f "$fullpath")) == "$below" ]]; then
       m lnf -T "$path" "$HOME/${path#$root/}"
@@ -41,14 +73,36 @@ subdir-link-r() {
 }
 
 
-
 common-file-setup() {
-  local dir fs x bdir f dst
+  local dir fs x f reload_systemd
+  local -a reload_services
+  local -a restart_services
+  reload_systemd=false
   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 /
+    if [[ -e $fs && $user =~ ^iank?$ ]]; then
+      while read -r line; do
+        file="${line:12}"
+        case $file in
+          etc/systemd/system/*)
+            reload_systemd=true
+            ;;
+          etc/dnsmasq.d/*)
+            restart_services+=(dnsmasq)
+            ;;
+        esac
+        # Previously did this with tar, but it doesn't
+        # update directory permissions.
+        #
+        # S = do spare files efficiently
+        # A = preserve acls
+        # X = preserve extended attributes
+        # i = itemize
+      done < <(s rsync -aiSAX --chown=root:root --chmod=g-s \
+                 --exclude=/etc/dovecot/users \
+                 --exclude='/etc/exim4/passwd*' \
+                 --exclude='/etc/exim4/*.pem' \
+                 $fs/ /)
     fi
 
     if [[ -e $dir/subdir_files ]]; then
@@ -58,9 +112,19 @@ common-file-setup() {
     (( ${#x[@]} >= 1 )) || continue
     m lnf ${x[@]} ~
   done
+  if $reload_systemd; then
+    m s systemctl daemon-reload
+  fi
+  for service in ${restart_services[@]}; do
+    if systemctl is-active $service >/dev/null; then
+      m s systemctl reload $service
+    fi
+  done
+
 }
 
-all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
+user=$(id -un)
+all_dirs=({/a/bin/ds,/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 /a/bin/ds/machine_specific/*.hosts; do
@@ -68,10 +132,14 @@ for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
 done
 
 c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
-case $USER in
+case $user in
   iank)
-    files=(/p/c/machine_specific/*/filesystem/etc/ssh/*_key)
-    if [[ -e $files ]]; then
+    files=(/p/c/machine_specific/*/filesystem/etc/ssh/*_key
+           /p/c/filesystem/etc/openvpn/client/*.key
+           /p/c/filesystem/etc/openvpn/easy-rsa/keys/*.key
+           /p/c/machine_specific/kw/filesystem/etc/openvpn/client/*.key
+          )
+    if [[ -e ${files[0]} ]]; then
       chmod 600 ${files[@]}
     fi
     # p needs to go first so .ssh link is created, then config link inside it
@@ -105,12 +173,17 @@ case $USER in
 
     ##### end special extra stuff #####
 
-    sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done'
-    sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in server/*.key client/*.key; do chmod 600 $f; done'
+    m sudo -H -u user2 "${BASH_SOURCE[0]}"
+
+    f=/a/bin/distro-setup/system-status
+    if [[ -x $f ]]; then
+      $f _
+    fi
+    mkdir -p ~/.local
+    echo 0 >~/.local/conflink
 
-    m sudo -H -u traci "$BASH_SOURCE"
     ;;
-  traci)
+  user2)
     m common-file-setup ${c_dirs[@]}
     ;;
   *)