iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various updates
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index e26be58e0693af8d3ce3ddb9e84bdba8a8e1f636..aecd0377119a99daf04b7d0e497e65c46f729de0 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-1,17
+1,40
@@
#!/bin/bash
source /a/bin/errhandle/err
#!/bin/bash
source /a/bin/errhandle/err
+_errcatch_cleanup() {
+ echo 1 >~/.local/conflink
+}
+
+
+usage() {
+ cat <<EOF
+Usage: ${0##*/} [OPTIONS]
+Link or otherwise install configuration files.
+
+-f For fast. Dont use lnf, use ln -sf. Good for updating existing files.
+EOF
+ exit $1
+}
+
m() {
echo "$*"
"$@"
}
s() { sudo "$@"; }
m() {
echo "$*"
"$@"
}
s() { sudo "$@"; }
-lnf() { /a/exe/lnf "$@"; }
+lnf() { /a/exe/lnf "$@"; }
+if [[ $1 == -f ]]; then # f for fast
+ lnf() { ln -sf "$@"; }
+elif
+ [[ $1 ]]; then
+ echo "error: unrecognized arguments" >&2
+ exit 0
+fi
shopt -s nullglob
shopt -s nullglob
-shopt -s extglob # note, already set with bash -l
+shopt -s extglob
+shopt -s dotglob
# If we make a link back to the root, we stop going deeper into subdir_files.
# This makes it so we can do subdir directories.
# If we make a link back to the root, we stop going deeper into subdir_files.
# This makes it so we can do subdir directories.
@@
-25,12
+48,14
@@
subdir-link-r() {
targets=( "$2"/!(.git|..|.) )
else
for f in "$1"/!(.git|..|.); do
targets=( "$2"/!(.git|..|.) )
else
for f in "$1"/!(.git|..|.); do
- [[ -d $f ]] && targets+=("$f") ||:
+ if [[ -d $f ]]; then targets+=("$f"); fi
done
fi
done
fi
- local below="$( readlink -f "$root/..")"
+ local below
+ below="$( readlink -f "$root/..")"
for path in "${targets[@]}"; do
for path in "${targets[@]}"; do
- local fullpath="$(readlink -f "$path")"
+ local fullpath
+ fullpath="$(readlink -f "$path")"
#e $fullpath $below # debug
if [[ -f $path || $(dirname $(readlink -f "$fullpath")) == "$below" ]]; then
m lnf -T "$path" "$HOME/${path#$root/}"
#e $fullpath $below # debug
if [[ -f $path || $(dirname $(readlink -f "$fullpath")) == "$below" ]]; then
m lnf -T "$path" "$HOME/${path#$root/}"
@@
-41,13
+66,19
@@
subdir-link-r() {
}
}
-
common-file-setup() {
common-file-setup() {
- local dir fs x bdir f dst
+ local dir fs x f systemd_reload
+ systemd_reload=false
for dir in "$@"; do
fs=$dir/filesystem
for dir in "$@"; do
fs=$dir/filesystem
- if [[ -e $fs && $USER =~ ^iank?$ ]]; then
+ if [[ -e $fs && $user =~ ^iank?$ ]]; then
+ # this could be done with rsync, something like this,
+ # but I haven't looked at the symlinks.
+ # s rsync -n -ahviSAXPH --specials --devices --chown=root:root --chmod=g-s $fs /
# note, symlinks get resolved, not copied.
# note, symlinks get resolved, not copied.
+ if s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -dz -C / | grep /etc/systemd &>/dev/null; then
+ systemd_reload=true
+ fi
s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
fi
s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
fi
@@
-58,9
+89,13
@@
common-file-setup() {
(( ${#x[@]} >= 1 )) || continue
m lnf ${x[@]} ~
done
(( ${#x[@]} >= 1 )) || continue
m lnf ${x[@]} ~
done
+ if $systemd_reload; then
+ m s systemctl daemon-reload
+ fi
}
}
-all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
+user=$(id -un)
+all_dirs=({/a/bin/ds,/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.
for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
# note, we assume a group of hosts does not have the
# same name as a single host, which is no problem on our scale.
for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
@@
-68,10
+103,14
@@
for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
done
c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
done
c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
-case $
USER
in
+case $
user
in
iank)
iank)
- files=(/p/c/machine_specific/*/filesystem/etc/ssh/*_key)
- if [[ -e $files ]]; then
+ files=(/p/c/machine_specific/*/filesystem/etc/ssh/*_key
+ /p/c/filesystem/etc/openvpn/client/*.key
+ /p/c/filesystem/etc/openvpn/easy-rsa/keys/*.key
+ /p/c/machine_specific/kw/filesystem/etc/openvpn/client/*.key
+ )
+ if [[ -e ${files[0]} ]]; then
chmod 600 ${files[@]}
fi
# p needs to go first so .ssh link is created, then config link inside it
chmod 600 ${files[@]}
fi
# p needs to go first so .ssh link is created, then config link inside it
@@
-105,15
+144,24
@@
case $USER in
##### end special extra stuff #####
##### end special extra stuff #####
- sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done'
- sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in server/*.key client/*.key; do chmod 600 $f; done'
+ if [[ -e /etc/openvpn ]]; then
+ sudo bash -c 'shopt -s nullglob && cd /etc/openvpn && for f in client/* server/*; do ln -sf $f .; done'
+ fi
+
+ m sudo -H -u user2 "${BASH_SOURCE[0]}"
+
+ f=/a/bin/distro-setup/system-status
+ if [[ -x $f ]]; then
+ $f _
+ fi
+ echo 0 >~/.local/conflink
- m sudo -H -u traci "$BASH_SOURCE"
;;
;;
-
traci
)
+
user2
)
m common-file-setup ${c_dirs[@]}
;;
*)
echo "$0: error: unexpected user"; exit 1
;;
esac
m common-file-setup ${c_dirs[@]}
;;
*)
echo "$0: error: unexpected user"; exit 1
;;
esac
+