X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=eb94ebe1a9ed1de38ddd8d541f84751e56d81854;hb=7cc6197f74e97cb522894046718712cd03d3d385;hp=b24427fe40737ef5cafff1f96895cc94e191873e;hpb=f9ccde727d3471c99b909a528aa7168281368084;p=distro-setup

diff --git a/conflink b/conflink
index b24427f..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
@@ -98,13 +102,14 @@ case $USER in
     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'
-    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"
     ;;