iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix missing sieve links on new systems
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index b24427fe40737ef5cafff1f96895cc94e191873e..f62de8b454c20da5f6867abb02e347c7dd80688c 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.
@@
-70,7
+71,11
@@
done
c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
case $USER in
iank)
c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
case $USER in
iank)
- files=(/p/c/machine_specific/*/filesystem/etc/ssh/*_key)
+ 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 ]]; then
chmod 600 ${files[@]}
fi
if [[ -e $files ]]; then
chmod 600 ${files[@]}
fi
@@
-98,17
+103,18
@@
case $USER in
if [[ -e $f ]]; then
s chmod 640 $f /etc/prometheus-pass
s chown root:www-data $f
if [[ -e $f ]]; then
s chmod 640 $f /etc/prometheus-pass
s chown root:www-data $f
- s chown root:prometheus /etc/prometheus-pass
+ 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'
fi
##### 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"
;;
;;
-
traci
)
+
user2
)
m common-file-setup ${c_dirs[@]}
;;
*)
m common-file-setup ${c_dirs[@]}
;;
*)