X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=03649f5cfd0815458bd30e5caffb13a9c89753dc;hb=b857462732e15f455e41f26e3048a390d7b399c0;hp=8431c168a40a5a36e13d7a2fd17ba80f39f1dbf5;hpb=f3e6a97425746ed185c28dcc03acf7e67a6af560;p=distro-setup

diff --git a/conflink b/conflink
index 8431c16..03649f5 100755
--- a/conflink
+++ b/conflink
@@ -43,18 +43,21 @@ subdir-link-r() {
     done
 }
 
+
+
 common-file-setup() {
-    local dir fs x
+    local dir fs x bdir f dst
     for dir in "$@"; do
         fs=$dir/filesystem
-        if [[ -e $fs && $USER == ian ]]; then
+        if [[ -e $fs && $USER =~ ^iank?$ ]]; then
             # note, symlinks get resolved, not copied.
-            m s cp -RLT --preserve=mode,timestamps $fs /
+            s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
         fi
+
         if [[ -e $dir/subdir_files ]]; then
-            subdir-link-r $dir/subdir_files
+            m subdir-link-r $dir/subdir_files
         fi
-        local x=( $dir/!(subdir_files|filesystem|machine_specific|..|.) )
+        local x=( $dir/!(binds|subdir_files|filesystem|machine_specific|..|.) )
         (( ${#x[@]} >= 1 )) || continue
         m lnf ${x[@]} ~
     done
@@ -69,13 +72,36 @@ done
 
 c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
 case $USER in
-    ian)
+    ian|iank)
         # p needs to go first so .ssh link is created, then config link inside it
-        common-file-setup ${all_dirs[@]}
-        sudo -u traci "$BASH_SOURCE"
+        m common-file-setup ${all_dirs[@]}
+
+        #### begin special extra stuff ####
+        install -d -m700 ~/gpg-agent-socket
+        if [[ -d /etc/bind/bind-writable ]]; then
+            # need bind writable dir for nsupdate, or else we get
+            # named[20823]: /etc/bind/db.iank.pw.jnl: create: permission denied
+            m s chgrp bind /etc/bind/bind-writable
+        fi
+        files=(/etc/bind/[Kk]*)
+        if [[ -e $files ]]; then
+            m s chgrp bind ${files[@]}
+        fi
+        if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
+            s chgrp www-data /etc/davpass
+        fi
+        if [[ -e /var/lib/znc/configs/znc.conf ]] && getent group znc; then
+          s chown znc:znc /var/lib/znc/configs/znc.conf
+          fi
+        /a/exe/lnf -T /p/arbtt-capture.log ~/.arbtt/capture.log
+        ##### end special extra stuff #####
+
+        sudo bash -c 'cd /etc/openvpn; for f in client/*; do ln -sf $f .; done'
+
+        m sudo -H -u traci "$BASH_SOURCE"
         ;;
     traci)
-        common-file-setup ${c_dirs[@]}
+        m common-file-setup ${c_dirs[@]}
         ;;
     *)
         echo "$0: error: unexpected user"; exit 1