X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_remote;h=237f4210903af85f36d7eb847463935b31c3eacb;hp=8518503457f64a0d6474d0026d5a170dedf3f6b6;hb=c6358beea0be57737b6a6980657b7b5744e51774;hpb=1f1550e467bccfbac8a8f88b93db6355745794be

diff --git a/vm_remote b/vm_remote
index 8518503..237f421 100755
--- a/vm_remote
+++ b/vm_remote
@@ -1,10 +1,8 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
-. "$tool"/functions.sh
-. "$tool"/vm.sh
-test ! "$(hostname --fqdn)" = "$vm_fqdn"
-test ! "$(hostname --fqdn)" = "$vm_host"
+. "$tool"/lib/functions.sh
+. "$tool"/etc/vm.sh
 
 rule_help () {
 	cat >&2 <<-EOF
@@ -33,11 +31,10 @@ rule_git_config () {
 	git config --replace remote.$vm HEAD:refs/heads/origin
 	)
  }
-rule_git_push () { # SYNTAX: $remote $options
+rule_git_push () { # SYNTAX: {host|vm} $git_commit_options
 	local remote=${1#remote=}; shift
 	git add . &&
 	git commit -a -C HEAD "$@" &&
-	local pwd=$(cd "$tool" && cd -)
 	GIT_SSH=./vm_ssh git push -v -f "$remote"
  }
 
@@ -52,30 +49,37 @@ rule__ssh_known_hosts_update () {
 	 whoami
  }
 rule_disk_key_send () {
-	gpg --decrypt key/secret/$vm_fqdn.disk.gpg |
-	ssh "$@" root@$vm_fqdn \
+	gpg --decrypt var/lib/luks/$vm_fqdn.key.gpg |
+	"$tool"/vm_ssh root@$vm_fqdn "$@" \
 	 -o CheckHostIP=no \
 	 -o HostKeyAlias=init.$vm_fqdn \
-	 -o StrictHostKeyChecking=yes \
-	 -o UserKnownHostsFile="$tool"/key/ssh.known_hosts \
 	 tee /lib/cryptsetup/passfifo \>/dev/null
  }
 rule_disk_key_backup () {
-	for part in root swap var home
+	for part in root var home
 	 do
-		rule_ssh sudo cryptsetup luksHeaderBackup /dev/$vm_lvm_vg/${vm_lvm_lv}_${part} |
-		gpg --encrypt --recipient $USER@ -o key/secret/${vm_lvm_lv}_${part}.luks.gpg
-	 done
- }
-rule_disk_key_restore () {
-	for part in root swap var home
-	 do
-		gpg --decrypt ${vm_lvm_lv}_${part}.luks |
-		rule_ssh sudo cryptsetup luksHeaderRestore /dev/$vm_lvm_vg/${vm_lvm_lv}_${part}
+		mkdir -p var/lib/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"
+		 ' |
+		gpg --encrypt --recipient $USER@ \
+		 -o var/lib/luks/${vm_lvm_lv}_${part}.luks.gpg
 	 done
  }
 
 rule=${1:-help}
 ${1+shift}
-set "${TRACE:+-x}"
+case $rule in
+ (help);;
+ (*)
+	test ! "$(hostname --fqdn)" = "$vm_fqdn"
+	test ! "$(hostname --fqdn)" = "$vm_host"
+	set "${TRACE:+-x}"
+	;;
+ esac
 rule_$rule "$@"