fixes, logging, and better shellcheck conformance

[distro-setup] / conflink

diff --git a/conflink b/conflink
index afbb9562ba8b577fc18eebd766b85dd0fb59f3b6..18a6ed84f0dc177c85e72ccf0aaa5adc075e93ca 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -114,7 +114,8 @@ common-file-setup() {
       # we dont want t, instead c for checksum.
       # That way we dont set times on directories.
       # -a = -rlptgoD
-      cmd=( s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:root
+      # -A is acls, implies -p
+      cmd=( s rsync -rclgoDiSAX --chmod=Dg-s --chown=root:root
             --exclude=/etc/dovecot/users
             --exclude='/etc/exim4/passwd*'
             --exclude='/etc/exim4/*.pem'
@@ -231,16 +232,11 @@ case $user in
     fi
     if [[ -e /p/c/user-specific ]]; then
       if getent passwd prometheus &>/dev/null; then
-        s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus-pass /etc
+        v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus-pass /etc
+        v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus/ssl/* /etc/prometheus/ssl
       fi
       if getent passwd www-data &>/dev/null; then
-        s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc
-      fi
-    fi
-    f=/etc/nagios4/htdigest.users
-    if [[ -e $f ]]; then
-      if getent passwd nagios &>/dev/null; then
-        s chown nagios:www-data $f
+        v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc
       fi
     fi