X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=56a251fb9be01e1e1cd1524d0a173cc7751040db;hb=957654ed1672c7ca933583549b9d8e9f37b1c802;hp=0e42e66613421055a46261f12fd21967df391e27;hpb=95eb9558206f8287febab80dd3f51d168a3ca831;p=distro-setup

diff --git a/conflink b/conflink
index 0e42e66..56a251f 100755
--- a/conflink
+++ b/conflink
@@ -18,10 +18,10 @@ EOF
 }
 
 
+s() { sudo "$@"; }
 m() {
   "$@"
 }
-s() { sudo "$@"; }
 v() {
   echo "$*"
   "$@"
@@ -56,6 +56,7 @@ readonly fast verbose
 ##### end command line parsing ########
 
 
+tmpf=$(mktemp)
 if $fast; then
   lnf() { ln -sf "$@"; }
 fi
@@ -106,18 +107,21 @@ common-file-setup() {
   local -a reload_services
   local -a restart_services
   reload_systemd=false
+  # note, i ran chmod -R g-s on the filesystem dirs
+  # so i could keep permissions of secret files
   for dir in "$@"; do
     fs=$dir/filesystem
     if [[ -e $fs && $user =~ ^iank?$ ]]; then
       # we dont want t, instead c for checksum.
       # That way we dont set times on directories.
       # -a = -rlptgoD
-      cmd=( s rsync -rclpgoDiSAX --chown=root:root --chmod=g-s
+      cmd=( s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:root
             --exclude=/etc/dovecot/users
             --exclude='/etc/exim4/passwd*'
             --exclude='/etc/exim4/*.pem'
             $fs/ / )
       echo "${cmd[@]@Q}"
+      "${cmd[@]}" | tee $tmpf
       while read -r line; do
         file="${line:12}"
         case $file in
@@ -147,7 +151,7 @@ common-file-setup() {
         # A = preserve acls
         # X = preserve extended attributes
         # i = itemize
-      done < <("${cmd[@]}")
+      done <$tmpf
     fi
 
     if ! $fast && [[ -e $dir/subdir_files ]]; then
@@ -213,13 +217,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
@@ -228,6 +236,7 @@ case $user in
     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
@@ -237,15 +246,29 @@ 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
+    f=/var/lib/bitcoind/settings.json
+    if [[ -e $f ]]; then
+      if getent passwd bitcoin &>/dev/null; then
+        s chown bitcoin:bitcoin $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