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 btrbk service
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 555d4d4277201db702d2d1a41cbe885b874dce72..e26be58e0693af8d3ce3ddb9e84bdba8a8e1f636 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-63,26
+63,30
@@
common-file-setup() {
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.
-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
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)
+ 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
# 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
- f
iles=(/var/lib/bind)
- if [[ -e $f
iles
]]; then
+ f
=/var/lib/bind
+ if [[ -e $f ]]; then
# reset to the original permissions.
# 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
fi
- sudo bash -c 'shopt -s nullglob;
cd /etc/bind; for f in *.key *.private
key.*; do chgrp bind $f; done'
+ 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
if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
s chgrp www-data /etc/davpass
fi
@@
-90,6
+94,15
@@
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'