X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=eb94ebe1a9ed1de38ddd8d541f84751e56d81854;hb=8599d1cafb7ca273609f07f42d8d3617bf7b7398;hp=e26be58e0693af8d3ce3ddb9e84bdba8a8e1f636;hpb=1f524e72136f1d10548bdc4f502c6405ba6dbcd0;p=distro-setup

diff --git a/conflink b/conflink
index e26be58..eb94ebe 100755
--- a/conflink
+++ b/conflink
@@ -70,7 +70,11 @@ done
 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
@@ -106,7 +110,6 @@ case $USER in
     ##### 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"
     ;;