various fixes, a few new features

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 56a251fb9be01e1e1cd1524d0a173cc7751040db..5c135c437f43443a5dc59297296128fb24617fbc 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -104,7 +104,6 @@ subdir-link-r() {
 
 common-file-setup() {
   local dir fs x f reload_systemd
-  local -a reload_services
   local -a restart_services
   reload_systemd=false
   # note, i ran chmod -R g-s on the filesystem dirs
@@ -234,27 +233,14 @@ case $user in
     if [[ -e /var/lib/znc ]] && getent group znc; then
       s chown -R znc:znc /var/lib/znc
     fi
-    for f in /etc/prometheus-{,export-}htpasswd; do
-      if [[ -e $f ]]; then
-        # note: this is duplicative of the file's own permissions
-        s chmod 640 $f
-        if getent passwd www-data &>/dev/null; then
-          s chown root:www-data $f
-        fi
-      fi
-    done
-    f=/etc/prometheus-pass
-    if [[ -e $f ]]; then
-      # note: this is duplicative of the file's own permissions
-      s chmod 640 $f
-      if getent passwd prometheus &>/dev/null; then
-        s chown root:prometheus $f
-      fi
+    if getent passwd prometheus &>/dev/null; then
+      s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus-pass /etc
+    fi
+    if getent passwd www-data &>/dev/null; then
+      s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/prometheus-web/prometheus-htpasswd /etc
     fi
     f=/etc/nagios4/htdigest.users
     if [[ -e $f ]]; then
-      # note: this is duplicative of the file's own permissions
-      s chmod 640 $f /etc/prometheus-pass
       if getent passwd nagios &>/dev/null; then
         s chown nagios:www-data $f
       fi