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

diff --git a/vm_remote b/vm_remote
index cf899d7..0a7ef55 100755
--- a/vm_remote
+++ b/vm_remote
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
-tool=${0%/*}
+tool=$(readlink -e "${0%/*}")
 . "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 
@@ -27,10 +27,10 @@ rule_git_configure () { # DESCRIPTION: configure ./.git correctement
 	(
 	cd "$tool"
 	git remote rm host || true
-	git remote add host $vm_host:tool/vm
+	git remote add host $vm_host:src/vm
 	git config --replace remote.host.push HEAD:refs/remotes/master
 	git remote rm hosted || true
-	git remote add hosted root@$vm_fqdn:tool/vm
+	git remote add hosted $vm_fqdn:src/vm
 	git config --replace remote.hosted.push HEAD:refs/remotes/master
 	git submodule update --init
 	)
@@ -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"
 	)
  }
 
@@ -58,18 +57,12 @@ rule__ssh_known_hosts_update () {
 	 whoami
  }
 
-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" |
+rule__x509_site_key_decrypt () { # SYNTAX: $site
+	local site="$1"; shift
+	gpg --decrypt "$tool"/var/sec/x509/"$site"/key.pass.gpg |
 	openssl rsa -passin 'stdin' \
-	 -in  "var/sec/x509/service/$service/key.pem" \
-	 -out '/dev/stdout' |
-	rule ssh "$@"  ' \
-		install -m 400 -o root -g root \
-		 /dev/stdin \
-		 "'"$remote_destination"'" \
-	 '
+	 -in  var/sec/x509/"$site"/key.pem \
+	 -out '/dev/stdout'
  }
 
 rule_luks_key_send () { # DESCRIPTION: envoie la clef de déchiffrement des partitions au démarrage de la VM.
@@ -98,7 +91,31 @@ 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/nginx/site.d/*/key_send
+	 do conf=${conf#"$tool"/etc/nginx/site.d/}
+		local site=${conf%/key_send}
+		rule _x509_site_key_decrypt \
+		 "$(cat "$tool"/etc/apache2/site.d/"$site"/x509_host)" |
+		rule ssh -l root ' \
+			sudo install -d -m 770 -o '"$user"' -g '"$user"' \
+			 /etc/apache2 \
+			 /etc/apache2/x509.d \
+			 /etc/apache2/x509.d/'"$site"'; \
+			sudo install -m 644 -o '"$user"' -g '"$user"' /dev/stdin \
+			 /etc/apache2/x509.d/'"$site"'/.gitignore <<-EOF
+				key.pem
+				EOF
+			sudo install -m 400 -o root -g root \
+			 /dev/stdin \
+			 /etc/apache2/x509.d/'"'$site'"'/key.pem
+		 '
+	 done
+ }
 rule_dovecot_key_send () {
+	rule _x509_site_key_decrypt imap."$vm_domainname" |
 	rule ssh -l root ' \
 		sudo install -d -m 770 -o root -g root \
 		 /etc/dovecot/'"$vm_domainname"'/ \
@@ -108,16 +125,55 @@ rule_dovecot_key_send () {
 		 /etc/dovecot/'"$vm_domainname"'/imap/x509/.gitignore <<-EOF
 			key.pem
 			EOF
+		sudo install -m 400 -o root -g root \
+		 /dev/stdin \
+		 /etc/dovecot/"$vm_domainname"/imap/x509/key.pem
 	 '
-	rule _x509_service_key_send_deciphered imap \
-	 /etc/dovecot/$vm_domainname/imap/x509/key.pem -l root "$@"
+ }
+rule_gitolite_git () {
+	(
+	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 '"$*"
+	)
+ }
+rule_nginx_configure () {
+	local -; set +f
+	for conf in "$tool"/etc/nginx/site.d/*/site.conf
+	 do conf=${conf#"$tool"/etc/nginx/site.d/}
+		local site="${conf%/site.conf}"
+		if test -f "$tool"/etc/nginx/site.d/"$site"/x509_host
+		 then
+			rule _x509_site_key_decrypt \
+			 "$(cat "$tool"/etc/nginx/site.d/"$site"/x509_host)" |
+			rule ssh -l root ' \
+				sudo install -d -m 770 -o root -g root \
+				 /etc/nginx \
+				 /etc/nginx/x509.d \
+				 /etc/nginx/x509.d/'"'$site'"'; \
+				sudo install -m 644 -o root -g root /dev/stdin \
+				 /etc/nginx/x509.d/'"'$site'"'/.gitignore <<-EOF
+					key.pem
+					EOF
+				sudo install -m 400 -o root -g root /dev/stdin \
+				 /etc/nginx/x509.d/'"'$site'"'/key.pem
+			 '
+		 fi
+		test ! -r "$tool"/etc/nginx/site.d/"$site"/remote.sh ||
+		.         "$tool"/etc/nginx/site.d/"$site"/remote.sh
+	 done
  }
 rule_postfix_key_send () {
+	rule _x509_site_key_decrypt smtpd."$vm_domainname" |
 	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
@@ -126,9 +182,10 @@ rule_postfix_key_send () {
 		 /etc/postfix/'"$vm_domainname"'/smtpd/x509/.gitignore <<-EOF
 			key.pem
 			EOF
+		install -m 400 -o root -g root \
+		 /dev/stdin \
+		 /etc/postfix/'"'$vm_domainname'"'/smtpd/x509/key.pem
 	 '
-	rule _x509_service_key_send_deciphered smtpd \
-	 /etc/postfix/$vm_domainname/smtpd/x509/key.pem -l root "$@"
  }
 
 rule=${1:-help}