X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_remote;h=b7ce833a360773ac8f0f8512877f2ec9355c3dfd;hp=cf899d72592be1b6a39fdeac4a8b82f0f054d76e;hb=fca2fed35a90c1085affdd48fcf1d16cbdd54597;hpb=f6488dca3163e1ca5870485351fdec671bec000f

diff --git a/vm_remote b/vm_remote
index cf899d7..b7ce833 100755
--- a/vm_remote
+++ b/vm_remote
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
-tool=${0%/*}
+tool=$(cd "${0%/*}"; cd -)
 . "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 
@@ -61,14 +61,14 @@ rule__ssh_known_hosts_update () {
 rule__x509_service_key_send_deciphered () { # SYNTAX: $service $remote_destination ${ssh_options-}
 	local service="$1"; shift
 	local remote_destination="$1"; shift
-	gpg --decrypt "var/sec/x509/service/$service/key.pass.gpg" |
+	gpg --decrypt "var/sec/x509/$vm_domainname/$service/key.pass.gpg" |
 	openssl rsa -passin 'stdin' \
-	 -in  "var/sec/x509/service/$service/key.pem" \
+	 -in  "var/sec/x509/$vm_domainname/$service/key.pem" \
 	 -out '/dev/stdout' |
 	rule ssh "$@"  ' \
 		install -m 400 -o root -g root \
 		 /dev/stdin \
-		 "'"$remote_destination"'" \
+		 '"$remote_destination"' \
 	 '
  }
 
@@ -98,6 +98,38 @@ rule_luks_key_backup () { # SYNTAX: ${gpg_options:---recipient $USER@} DESCRIPTI
 		 -o var/sec/luks/${vm_lvm_lv}_${part}.luks.gpg
 	 done
  }
+
+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
+			${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"
+		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; \
+				sudo install -m 644 -o '"$user"' -g '"$user"' /dev/stdin \
+				 /etc/apache2/site.d/'"$site_dir"'/x509/.gitignore <<-EOF
+					key.pem
+					EOF
+			 '
+			rule _x509_service_key_send_deciphered $service \
+			 ~"$user"/etc/apache2/"$site_dir"/x509/key.pem -l root "$@"
+			;;
+		 esac
+	 done
+ }
 rule_dovecot_key_send () {
 	rule ssh -l root ' \
 		sudo install -d -m 770 -o root -g root \
@@ -110,7 +142,50 @@ rule_dovecot_key_send () {
 			EOF
 	 '
 	rule _x509_service_key_send_deciphered imap \
-	 /etc/dovecot/$vm_domainname/imap/x509/key.pem -l root "$@"
+	 /etc/dovecot/$vm_domainname/$service/x509/key.pem -l root "$@"
+ }
+rule_gitolite_configure () {
+	(
+	cd "$tool"/etc/gitolite
+	GIT_SSH=../../lib/ssh \
+	ssh-agent sh -c ' \
+		SSH_ASKPASS='"$tool"'/lib/ssh-pass \
+		SSH_ID=git \
+		ssh-add '"$tool"'/var/sec/ssh/git </dev/null && \
+		git push -v origin '"$*"
+	)
+ }
+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
+			${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"
+		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; \
+				sudo install -m 644 -o root -g root /dev/stdin \
+				 /etc/nginx/site.d/'"$site_dir"'/x509/.gitignore <<-EOF
+					key.pem
+					EOF
+			 '
+			rule _x509_service_key_send_deciphered $service \
+			 /etc/nginx/"$site_dir"/x509/key.pem -l root "$@"
+			;;
+		 esac
+	 done
  }
 rule_postfix_key_send () {
 	rule ssh -l root ' \