Ajout : etc/openssl/

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index 8fe0561..f951f3c 100755 (executable)
--- 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"/lib/rule.sh
 . "$tool"/etc/vm.sh
 
 rule_help () { # SYNTAX: [--hidden]
@@ -23,7 +23,7 @@ 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
@@ -32,18 +32,23 @@ rule_git_config () { # DESCRIPTION: configure le .git local pour bien pousser
        git remote rm hosted || true
        git remote add hosted root@$vm_fqdn:tool/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" "$@"
+       info "penser à faire : vm_hosted git_reset"
+       )
  }
 
 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 $*" $vm_fqdn
  }
 rule__ssh_known_hosts_update () {
        rule ssh \
@@ -52,27 +57,29 @@ rule__ssh_known_hosts_update () {
         -o HashKnownHosts=no \
         whoami
  }
-rule_key_disk_send () {
-       gpg --decrypt var/lib/luks/$vm_fqdn.key.gpg |
-       "$tool"/vm_ssh root@$vm_fqdn "$@" \
+rule_luks_key_send () { # NOTE: envoie la clef de déchiffrement des partitions au démarrage de la VM.
+       gpg --decrypt var/sec/luks/$vm_fqdn.key.gpg |
+       "$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 () { # NOTE: sauvegarde localement les entêtes des partitions chiffrées. ENVIRONMENT: $gpg_recipient
        for part in root var home
         do
-               mkdir -p var/lib/luks
+               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@ \
-                -o var/lib/luks/${vm_lvm_lv}_${part}.luks.gpg
+               gpg --encrypt --recipient "${gpg_recipient:-$USER@}" \
+                -o var/sec/luks/${vm_lvm_lv}_${part}.luks.gpg
         done
  }