X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_remote;h=64f57dfbe3e4e0bfe09a65a663a8378706c53fe2;hb=4f79b1f6a69ff01b478567644fd523297fdf58dd;hp=37e6dc1a0e02973dbc7414d2371e29720520d786;hpb=de0435e3d96f9205fd7a27809d2004d5737469fa;p=lhc%2Fateliers.git

diff --git a/vm_remote b/vm_remote
index 37e6dc1..64f57df 100755
--- a/vm_remote
+++ b/vm_remote
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
-tool=$(cd "${0%/*}"; cd -)
+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
 	)
@@ -47,7 +47,7 @@ rule_ssh () {
 	"$tool"/lib/ssh $vm_fqdn "$@"
  }
 rule_mosh () {
-	mosh --ssh="$tool/lib/ssh $*" $vm_fqdn
+	mosh --ssh="$tool/lib/ssh ${ssh-}" -- $vm_fqdn "$@"
  }
 rule__ssh_known_hosts_update () {
 	rule ssh \
@@ -92,54 +92,7 @@ rule_luks_key_backup () { # SYNTAX: ${gpg_options:---recipient $USER@} DESCRIPTI
 	 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 port domain
-		IFS=. read -r port domain <<-EOF
-			${conf%/VirtualHost.conf}
-			EOF
-		assert 'test "${port:+set}"'
-		assert 'test "${domain:+set}"'
-		local site="$port.$domain"
-		case $port in
-		 (443)
-			rule _x509_site_key_decrypt "$domain" |
-			rule ssh -l root ' \
-				sudo install -d -m 770 -o '"$user"' -g '"$user"' \
-				 /etc/apache2 \
-				 /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"'/x509/.gitignore <<-EOF
-					key.pem
-					EOF
-				sudo install -m 400 -o root -g root \
-				 /dev/stdin \
-				 /etc/apache2/'"'$site'"'/x509/key.pem
-			 '
-			;;
-		 esac
-	 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"'/ \
-		 /etc/dovecot/'"$vm_domainname"'/imap \
-		 /etc/dovecot/'"$vm_domainname"'/imap/x509 ; \
-		sudo install -m 644 -o root -g root /dev/stdin \
-		 /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_gitolite_configure () {
+rule_gitolite_git () {
 	(
 	cd "$tool"/etc/gitolite
 	GIT_SSH=../../lib/ssh \
@@ -147,51 +100,40 @@ rule_gitolite_configure () {
 		SSH_ASKPASS='"$tool"'/lib/ssh-pass \
 		SSH_ID=git \
 		ssh-add '"$tool"'/var/sec/ssh/git </dev/null && \
-		git push -v origin '"$*"
+		git '"$*"
 	)
  }
-rule_nginx_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/nginx/site.d/"$site"/key_send)" |
-		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
-			
-			install -m 400 -o root -g root \
-			 /dev/stdin \
-			 /etc/nginx/x509.d/'"'$site'"'/key.pem
-		 '
-	 done
+rule_runit_configure () { # SYNTAX: $sv [...] -- $configure_options
+	if test $# = 0
+	 then
+		set +x
+		rule ssh sudo sv status \
+		 $(sudo find /etc/sv \
+		 -mindepth 1 -maxdepth 1 -type d \
+		 -printf '%p\n' | sort)
+	 else
+		local services=
+		while [ $# -gt 0 ]
+		 do case $1 in
+			 (--) shift; break;;
+			 (*) services="$services $1"; shift;;
+			 esac
+		 done
+		for sv in $(find "$tool"/etc/sv \
+		 -mindepth 1 -maxdepth 1 -type d \
+		 -false $(printf -- '-or -name %s\n' $services) \
+		 -printf '%f\n')
+		 do
+			rule _runit_sv_configure "$sv" "$@"
+		 done
+	 fi
  }
-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"'/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
-			EOF
-		sudo install -m 644 -o root -g root /dev/stdin \
-		 /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__runit_sv_configure () { # SYNTAX: $sv $configure_options
+	local sv="$1"; shift
+	(
+	test ! -r "$tool"/etc/sv/"$sv"/remote.sh ||
+	.         "$tool"/etc/sv/"$sv"/remote.sh || return 1
+	)
  }
 
 rule=${1:-help}