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 /
- fi
-
- # one program so far does not work with a symlink,
- # so we have to use a bind mount
- bdir=$dir/binds
- if [[ -e $bdir && $USER == ian ]]; then
- for f in $(find $bdir -type f); do
- dst=/home/ian/${f##$bdir}
- binds+="$f $dst none bind 0 0"$'\n'
- if [[ ! -e $dst || $(stat -c%i $f $dst |uniq -u) ]]; then
- if mountpoint -q $dst; then
- s umount $dst
- fi
- # note: in future, may need to mkdir also
- [[ -e $dst ]] || touch $dst
- s mount --bind $f $dst
- fi
- done
+ 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/!(binds|subdir_files|filesystem|machine_specific|..|.) )
(( ${#x[@]} >= 1 )) || continue
done
}
-binds=""
all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
# note, we assume a group of hosts does not have the
# same name as a single host, which is no problem on our scale.
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[@]}
- if [[ $binds ]]; then
- s /a/exe/cedit conflink /etc/fstab <<<"$binds" || [[ $? == 1 ]]
- fi
+ 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
- s chgrp bind /etc/bind/bind-writable
+ m s chgrp bind /etc/bind/bind-writable
+ fi
+ files=(/etc/bind/[Kk]*)
+ if [[ -e $files ]]; then
+ m s chgrp bind ${files[@]}
fi
- sudo -u traci "$BASH_SOURCE"
+ if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
+ s chgrp www-data /etc/davpass
+ fi
+ if [[ -e /var/lib/znc ]] && getent group znc; then
+ s chown -R znc:znc /var/lib/znc
+ 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