fixed permissions again

markus-96 · Jun 24, 2022 · bd56762 · bd56762
1 parent 9e6edd0
commit bd56762
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/kvmd.install b/kvmd.install
@@ -34,9 +34,14 @@ post_upgrade() {
 
 	for target in nginx vnc; do
 		chown root:root /etc/kvmd/$target/ssl
-		chown root:kvmd-$target /etc/kvmd/$target/ssl/*
-		chmod 440 /etc/kvmd/$target/ssl/server.key
-		chmod 444 /etc/kvmd/$target/ssl/server.crt
+		if [ -f /etc/kvmd/$target/ssl/server.key ]; then
+			chown root:kvmd-$target /etc/kvmd/$target/ssl/server.key
+			chmod 440 /etc/kvmd/$target/ssl/server.key
+		fi
+		if [ -f /etc/kvmd/$target/ssl/server.crt ]; then
+			chown root:kvmd-$target /etc/kvmd/$target/ssl/server.crt
+			chmod 444 /etc/kvmd/$target/ssl/server.crt
+		fi
 	done
 
 	echo "==> Patching configs ..."

diff --git a/scripts/kvmd-certbot b/scripts/kvmd-certbot
@@ -62,7 +62,7 @@ if [ "$1" == "renew" ]; then
 			rm -rf '$new'
 			cp -a '$tmp' '$new'
 			rm '$new/updated'
-			chmod 750 '$new/config/'{archive,live}
+			chmod 755 '$new/config/'{archive,live}
 			chmod 640 '$new'/config/archive/*/privkey*.pem
 			sed -s -i -e 's| = $tmp/| = $cur/|g' '$new/config/renewal/'*
 			sync