various improvements

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 1cefd0bd3f7bad668d25e380b717c80a51689b7e..f798204c4a1ff32d1dd2c507c91d8f6362c36ee5 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -237,11 +237,19 @@ case $user in
     f=/etc/prometheus-pass
     if [[ -e $f ]]; then
       # note: this is duplicative of the file's own permissions
-      s chmod 640 $f /etc/prometheus-pass
+      s chmod 640 $f
       if getent passwd prometheus &>/dev/null; then
         s chown root:prometheus $f
       fi
     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
+    fi
     ##### end special extra stuff #####
 
     if ! $fast; then