lots of fixes, new music stuff

[distro-setup] / conflink

diff --git a/conflink b/conflink
index b045711f75dc04cf9ed7033b0137043a1c1437e8..b44c4c324f787d5dcb4bbf6399d2a3423a386995 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -18,10 +18,10 @@ EOF
 }
 
 
+s() { sudo "$@"; }
 m() {
   "$@"
 }
-s() { sudo "$@"; }
 v() {
   echo "$*"
   "$@"
@@ -117,7 +117,7 @@ common-file-setup() {
             --exclude='/etc/exim4/passwd*'
             --exclude='/etc/exim4/*.pem'
             $fs/ / )
-      m "${cmd[@]@Q}"
+      echo "${cmd[@]@Q}"
       while read -r line; do
         file="${line:12}"
         case $file in
@@ -213,13 +213,17 @@ case $user in
     #### begin special extra stuff ####
     install -d -m700 ~/gpg-agent-socket
 
+    if [[ -e /etc/bitcoin ]] && getent group bitcoin &>/dev/null; then
+      s chown bitcoin:bitcoin /etc/bitcoin
+    fi
+
     f=/var/lib/bind
     if [[ -e $f ]]; then
       # reset to the original permissions.
       m s chgrp -R bind $f
       m s chmod g+w $f
     fi
-    sudo bash -c 'shopt -s nullglob; for f in /etc/bind/*.key /etc/bind/*.private /etc/bind/key.*; do chgrp bind $f; done'
+    s bash -c 'shopt -s nullglob; for f in /etc/bind/*.key /etc/bind/*.private /etc/bind/key.*; do chgrp bind $f; done'
     if [[ -e /etc/caldav-htpasswd ]] && getent group www-data &>/dev/null; then
       s chgrp www-data /etc/caldav-htpasswd
     fi
@@ -237,15 +241,23 @@ 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
-      m sudo -H -u user2 "${BASH_SOURCE[0]}"
+      m s -H -u user2 "${BASH_SOURCE[0]}"
     fi
 
     f=/a/bin/distro-setup/system-status