X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_remote;h=64f57dfbe3e4e0bfe09a65a663a8378706c53fe2;hp=0b8d0efd106e88f8213c30d693f083efe5b5d272;hb=eefc410c23df14d9e47bfc1eedcfb500d557c5a8;hpb=71b41ef372b4529615021ebaff1e8ad1dddef317

diff --git a/vm_remote b/vm_remote
index 0b8d0ef..64f57df 100755
--- a/vm_remote
+++ b/vm_remote
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
-tool=${0%/*}
-. "$tool"/lib/functions.sh
+tool=$(readlink -e "${0%/*}")
+. "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 
 rule_help () { # SYNTAX: [--hidden]
@@ -23,27 +23,31 @@ rule_help () { # SYNTAX: [--hidden]
 		EOF
  }
 
-rule_git_config () { # DESCRIPTION: configure le .git local pour bien pousser
+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
 	)
  }
 rule_git_push () { # SYNTAX: {host|hosted} $git_push_options
+	(
+	cd "$tool"
 	local remote=${1#remote=}; shift
-	GIT_SSH=./vm_ssh git push -v "$remote" "$@"
+	GIT_SSH=./lib/ssh git push -v "$remote" "$@"
+	)
  }
 
 rule_ssh () {
-	"$tool"/vm_ssh $vm_fqdn "$@"
+	"$tool"/lib/ssh $vm_fqdn "$@"
  }
 rule_mosh () {
-	mosh --ssh="$tool/vm_ssh $*" $vm_fqdn
+	mosh --ssh="$tool/lib/ssh ${ssh-}" -- $vm_fqdn "$@"
  }
 rule__ssh_known_hosts_update () {
 	rule ssh \
@@ -52,30 +56,86 @@ rule__ssh_known_hosts_update () {
 	 -o HashKnownHosts=no \
 	 whoami
  }
-rule_key_disk_send () {
+
+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/"$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.
 	gpg --decrypt var/sec/luks/$vm_fqdn.key.gpg |
-	"$tool"/vm_ssh root@$vm_fqdn "$@" \
+	"$tool"/lib/ssh root@$vm_fqdn "$@" \
 	 -o CheckHostIP=no \
 	 -o HostKeyAlias=init.$vm_fqdn \
 	 tee /lib/cryptsetup/passfifo \>/dev/null
  }
-rule_key_disk_backup () {
+rule_luks_key_backup () { # SYNTAX: ${gpg_options:---recipient $USER@} DESCRIPTION: sauvegarde localement les entêtes des partitions chiffrées.
+	test "${*+set}" || set -- --recipient "$USER@"
 	for part in root var home
 	 do
 		mkdir -p var/sec/luks
 		rule ssh -l root ' \
-			tmp=$(mktemp)
-			cryptsetup luksHeaderBackup \
-			 /dev/$vm_lvm_vg/${vm_lvm_lv}_${part} \
-			 --header-backup-file "$tmp" \
-			cat "$tmp"
-			shred --remove "$tmp"
+			set -e -f -u;
+			exec 2>/dev/null;
+			tmp=$(mktemp -t "luks.'"$part"'.XXXXXXXX.tmp" --dry-run);
+			cryptsetup luksHeaderBackup >/dev/null \
+			 /dev/'"$vm_lvm_vg"'/'"$vm_lvm_lv"'_'"$part"' \
+			 --header-backup-file "$tmp"; \
+			cat "$tmp";
+			shred >/dev/null --remove "$tmp"; \
 		 ' |
-		gpg --encrypt --recipient $USER@ \
+		gpg "$@" --encrypt \
 		 -o var/sec/luks/${vm_lvm_lv}_${part}.luks.gpg
 	 done
  }
 
+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_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__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}
 ${1+shift}
 case $rule in