X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_remote;fp=vm_remote;h=438f92263b2280c3cafa68dc866402094eb5d20b;hp=b7ce833a360773ac8f0f8512877f2ec9355c3dfd;hb=7079d0048c3399d2c23d3c80ab9aa065511b262e;hpb=7de0825b8ffd040fe47c93dc37009830c39b2bd6

diff --git a/vm_remote b/vm_remote
index b7ce833..438f922 100755
--- a/vm_remote
+++ b/vm_remote
@@ -103,29 +103,27 @@ rule_apache2_key_send () {
 	local -; set +f
 	for conf in "$tool"/etc/apache2/site.d/*/VirtualHost.conf
 	 do conf=${conf#"$tool"/etc/apache2/site.d/}
-		local user port service site
-		IFS=. read -r user port service site <<-EOF
+		local port domain
+		IFS=. read -r port domain <<-EOF
 			${conf%\/VirtualHost\.conf}
 			EOF
-		assert 'test "${user:+set}"'
-		assert 'test "${service:+set}"'
-		assert 'test "${site:+set}"'
 		assert 'test "${port:+set}"'
-		local site_dir="$user.$port.$service.$site"
+		assert 'test "${domain:+set}"'
+		local site="$port.$domain"
 		case $port in
 		 (443)
 			rule ssh -l root ' \
 				sudo install -d -m 770 -o '"$user"' -g '"$user"' \
 				 /etc/apache2 \
-				 /etc/apache2/site.d/'"$site_dir"' \
-				 /etc/apache2/site.d/'"$site_dir"'/x509; \
+				 /etc/apache2/site.d/'"$site"' \
+				 /etc/apache2/site.d/'"$site"'/x509; \
 				sudo install -m 644 -o '"$user"' -g '"$user"' /dev/stdin \
-				 /etc/apache2/site.d/'"$site_dir"'/x509/.gitignore <<-EOF
+				 /etc/apache2/site.d/'"$site"'/x509/.gitignore <<-EOF
 					key.pem
 					EOF
 			 '
 			rule _x509_service_key_send_deciphered $service \
-			 ~"$user"/etc/apache2/"$site_dir"/x509/key.pem -l root "$@"
+			 /etc/apache2/"$site"/x509/key.pem -l root "$@"
 			;;
 		 esac
 	 done
@@ -159,30 +157,28 @@ rule_nginx_key_send () {
 	local -; set +f
 	for conf in "$tool"/etc/nginx/site.d/*/server.conf
 	 do conf=${conf#"$tool"/etc/nginx/site.d/}
-		local user port service site
-		IFS=. read -r user port service site <<-EOF
+		local port domain
+		IFS=. read -r port domain <<-EOF
 			${conf%\/server\.conf}
 			EOF
-		assert 'test "${user:+set}"'
-		assert 'test "${service:+set}"'
-		assert 'test "${site:+set}"'
 		assert 'test "${port:+set}"'
-		local site_dir="$user.$port.$service.$site"
+		assert 'test "${domain:+set}"'
+		local site="$port.$domain"
 		case $port in
 		 (443)
 			rule ssh -l root ' \
 				sudo install -d -m 770 -o root -g root \
 				 /etc/nginx \
 				 /etc/nginx/site.d \
-				 /etc/nginx/site.d/'"$site_dir"' \
-				 /etc/nginx/site.d/'"$site_dir"'/x509; \
+				 /etc/nginx/site.d/'"$site"' \
+				 /etc/nginx/site.d/'"$site"'/x509; \
 				sudo install -m 644 -o root -g root /dev/stdin \
-				 /etc/nginx/site.d/'"$site_dir"'/x509/.gitignore <<-EOF
+				 /etc/nginx/site.d/'"$site"'/x509/.gitignore <<-EOF
 					key.pem
 					EOF
 			 '
 			rule _x509_service_key_send_deciphered $service \
-			 /etc/nginx/"$site_dir"/x509/key.pem -l root "$@"
+			 /etc/nginx/"$site"/x509/key.pem -l root "$@"
 			;;
 		 esac
 	 done