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.
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.
-for x in /p/c/machine_specific/*.hosts; do
+for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
if grep -qxF $HOSTNAME $x; then all_dirs+=( ${x%.hosts} ); fi
done
c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
case $USER in
- ian|iank)
+ iank)
+ 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
# p needs to go first so .ssh link is created, then config link inside it
m common-file-setup ${all_dirs[@]}
#### begin special extra stuff ####
install -d -m700 ~/gpg-agent-socket
- files=(/var/lib/bind)
- if [[ -e $files ]]; then
+ f=/var/lib/bind
+ if [[ -e $f ]]; then
# reset to the original permissions.
- m s chgrp -R bind ${files[@]}
- m s chmod g+w ${files[@]}
+ m s chgrp -R bind $f
+ m s chmod g+w $f
fi
+ sudo bash -c 'shopt -s nullglob; for f in /etc/bind/*.key /etc/bind/*.private /etc/bind/key.*; do chgrp bind $f; done'
if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
s chgrp www-data /etc/davpass
fi
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 'cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done'
- sudo bash -c 'cd /etc/openvpn; for f in server/*.key client/*.key; do chmod 600 $f; done'
+ sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done'
- m sudo -H -u traci "$BASH_SOURCE"
+ m sudo -H -u user2 "$BASH_SOURCE"
;;
- traci)
+ user2)
m common-file-setup ${c_dirs[@]}
;;
*)