mostly features, some minor bug fixes

[distro-setup] / conflink

diff --git a/conflink b/conflink
index afbb9562ba8b577fc18eebd766b85dd0fb59f3b6..efc7dd7ed7c56c8bb9b3cd13d601a85b947a7982 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -237,12 +237,6 @@ case $user in
         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
-      fi
-    fi
 
     if [[ -d /var/lib/bitcoind && -d /p/c/user-specific/bitcoin ]]; then
       s rsync -clpgoDiSAX --chmod=Dg-s --chown=bitcoin:bitcoin /p/c/user-specific/bitcoin/settings.json /var/lib/bitcoind