X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=555d4d4277201db702d2d1a41cbe885b874dce72;hb=fbb0315374736f92d950545796beaa79cbdc1f49;hp=4e62edbcc39469d44b66336ba1dbff81321f094a;hpb=2d3ce30754a3f24d922635647bab4990b60f5c27;p=distro-setup

diff --git a/conflink b/conflink
index 4e62edb..555d4d4 100755
--- a/conflink
+++ b/conflink
@@ -82,6 +82,7 @@ case $USER in
       m s chgrp -R bind ${files[@]}
       m s chmod g+w ${files[@]}
     fi
+    sudo bash -c 'shopt -s nullglob; cd /etc/bind; for f in *.key *.private key.*; do chgrp bind $f; done'
     if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
       s chgrp www-data /etc/davpass
     fi
@@ -91,8 +92,8 @@ case $USER in
     /a/exe/lnf -T /p/arbtt-capture.log ~/.arbtt/capture.log
     ##### end special extra stuff #####
 
-    sudo bash -c 'cd /etc/openvpn; for f in client/*; do ln -sf $f .; done'
-    sudo bash -c 'chmod 600 /etc/openvpn/client/*.key'
+    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"
     ;;