Modification : polissage et log

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index 8518503..1a599dc 100755 (executable)
--- 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
@@ -15,10 +13,10 @@ rule_help () {
                             Voir \`$tool/vm_hosted' pour les utilitaires côté VM hébergée.
                SYNTAX: $0 \$RULE \${RULE}_SYNTAX
                RULES:
-               $(sed -ne 's/^rule_\([^_][^ ]*\) () {\( *#.*\|\)/\t\1\2/p' "$tool"/vm.sh "$0")
+               $(sed -ne 's/^rule_\([^_][^ ]*\) () {\( *#.*\|\)/\t\1\2/p' "$tool"/etc/vm.sh "$0")
                ENVIRONMENT:
                  TRACE # affiche les commandes avant leur exécution
-               $(sed -ne 's/^readonly \([^ ][^ =]*\).*}\( *#.*\|\)$/\t$\1\2/p' "$tool"/vm.sh "$0")
+               $(sed -ne 's/^readonly \([^ ][^ =]*\).*}\( *#.*\|\)$/\t$\1\2/p' "$tool"/etc/vm.sh "$0")
                EOF
  }
 
@@ -28,16 +26,13 @@ rule_git_config () {
        git config remote.host.url >/dev/null ||
        git remote add host $vm_host:tool/vm
        git config --replace remote.host HEAD:refs/heads/origin
-       git config remote.$vm.url >/dev/null ||
+       git config remote.vm.url >/dev/null ||
        git remote add vm root@$vm_fqdn:tool/vm
        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 +47,36 @@ 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}"
-rule_$rule "$@"
+case $rule in
+ (help);;
+ (*)
+       assert 'test ! "$(hostname --fqdn)" = "$vm_fqdn"' vm_fqdn
+       assert 'test ! "$(hostname --fqdn)" = "$vm_host"' vm_host
+       ;;
+ esac
+rule $rule "$@"