iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop using unison, various updates
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 0010c9d6f347e04691120d02e2cdbfcf0f3a3ed9..bb5d480d4ee04d7c235ba25fd7dff78dfa70374e 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-11,7
+11,8
@@
lnf() { /a/exe/lnf "$@"; }
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
+26,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/}"
@@
-43,10
+46,10
@@
subdir-link-r() {
common-file-setup() {
common-file-setup() {
- local dir fs x
bdir f dst
+ local dir fs x
f
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
# note, symlinks get resolved, not copied.
s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
fi
# note, symlinks get resolved, not copied.
s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
fi
@@
-60,6
+63,7
@@
common-file-setup() {
done
}
done
}
+user=$(id -un)
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.
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.
@@
-68,10
+72,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
@@
-94,14
+102,22
@@
case $USER in
s chown -R znc:znc /var/lib/znc
fi
/a/exe/lnf -T /p/arbtt-capture.log ~/.arbtt/capture.log
s chown -R znc:znc /var/lib/znc
fi
/a/exe/lnf -T /p/arbtt-capture.log ~/.arbtt/capture.log
+ f=/etc/prometheus-htpasswd
+ if [[ -e $f ]]; then
+ s chmod 640 $f /etc/prometheus-pass
+ s chown root:www-data $f
+ if getent passwd prometheus; then
+ s chown root:prometheus /etc/prometheus-pass
+ fi
+ fi
+
##### end special extra stuff #####
sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done'
##### 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'
- m sudo -H -u
traci "$BASH_SOURCE
"
+ m sudo -H -u
user2 "${BASH_SOURCE[0]}
"
;;
;;
-
traci
)
+
user2
)
m common-file-setup ${c_dirs[@]}
;;
*)
m common-file-setup ${c_dirs[@]}
;;
*)