iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mostly reorganizing and cleanup
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 7954a223e06e3020939278ecb92786cb820b1538..38aacf02ac885a8a8c2ff0da27043c007373f457 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-49,13
+49,13
@@
common-file-setup() {
local dir fs x bdir f dst
for dir in "$@"; do
fs=$dir/filesystem
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.
# 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
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
fi
local x=( $dir/!(binds|subdir_files|filesystem|machine_specific|..|.) )
(( ${#x[@]} >= 1 )) || continue
@@
-72,18
+72,32
@@
done
c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
case $USER in
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
# p needs to go first so .ssh link is created, then config link inside it
- common-file-setup ${all_dirs[@]}
+ 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
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
+ if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
+ s chgrp www-data /etc/davpass
fi
fi
- sudo -u traci "$BASH_SOURCE"
+ ##### end special extra stuff #####
+
+
+
+ m sudo -H -u traci "$BASH_SOURCE"
;;
traci)
;;
traci)
- common-file-setup ${c_dirs[@]}
+
m
common-file-setup ${c_dirs[@]}
;;
*)
echo "$0: error: unexpected user"; exit 1
;;
*)
echo "$0: error: unexpected user"; exit 1