X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_remote;h=467d52875c6010794593f240ee15d3fa6b0841d3;hb=c66bfacc6bac1bcb030675983107e4b90b08029b;hp=d52b59555b6b744021d9721af246ff0c0f084149;hpb=ac6452c7821434c9750210bf75a95e51d876dc3d;p=lhc%2Fateliers.git

diff --git a/vm_remote b/vm_remote
index d52b595..467d528 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
 
@@ -40,7 +40,6 @@ rule_git_push () { # SYNTAX: {host|hosted} $git_push_options
 	cd "$tool"
 	local remote=${1#remote=}; shift
 	GIT_SSH=./lib/ssh git push -v "$remote" "$@"
-	info "penser à faire : vm_hosted git_reset"
 	)
  }
 
@@ -103,29 +102,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
@@ -144,34 +141,43 @@ rule_dovecot_key_send () {
 	rule _x509_service_key_send_deciphered imap \
 	 /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
+		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
@@ -180,8 +186,8 @@ rule_postfix_key_send () {
 	rule ssh -l root ' \
 		sudo install -d -m 770 -o root -g root \
 		 /etc/postfix/'"$vm_domainname"'/ \
-		 /etc/postfix/'"$vm_domainname"'/smptd \
-		 /etc/postfix/'"$vm_domainname"'/smptd/x509; \
+		 /etc/postfix/'"$vm_domainname"'/smtpd \
+		 /etc/postfix/'"$vm_domainname"'/smtpd/x509; \
 		sudo install -m 644 -o root -g root /dev/stdin \
 		 /etc/postfix/'"$vm_domainname"'/smtp/x509/.gitignore <<-EOF
 			key.pem