Correction : vm_remote : rule_key_disk_backup .

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index 19ce8d4..7601a01 100755 (executable)
--- a/vm_remote
+++ b/vm_remote
@@ -28,20 +28,24 @@ rule_git_config () { # DESCRIPTION: configure le .git local pour bien pousser
        cd "$tool"
        git remote rm host || true
        git remote add host $vm_host:tool/vm
-       git config --replace remote.host.push HEAD:refs/heads/origin
+       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 config --replace remote.hosted.push HEAD:refs/heads/origin
+       git config --replace remote.hosted.push HEAD:refs/remotes/master
        )
  }
 rule_git_push () { # SYNTAX: {host|hosted} $git_push_options
        local remote=${1#remote=}; shift
        GIT_SSH=./vm_ssh git push -v "$remote" "$@"
+       info "penser à faire : vm_hosted git_reset"
  }
 
 rule_ssh () {
        "$tool"/vm_ssh $vm_fqdn "$@"
  }
+rule_mosh () {
+       mosh --ssh="$tool/vm_ssh $*" $vm_fqdn
+ }
 rule__ssh_known_hosts_update () {
        rule ssh \
         -o StrictHostKeyChecking=no \
@@ -50,7 +54,7 @@ rule__ssh_known_hosts_update () {
         whoami
  }
 rule_key_disk_send () {
-       gpg --decrypt var/lib/luks/$vm_fqdn.key.gpg |
+       gpg --decrypt var/sec/luks/$vm_fqdn.key.gpg |
        "$tool"/vm_ssh root@$vm_fqdn "$@" \
         -o CheckHostIP=no \
         -o HostKeyAlias=init.$vm_fqdn \
@@ -59,17 +63,19 @@ rule_key_disk_send () {
 rule_key_disk_backup () {
        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
+                -o var/sec/luks/${vm_lvm_lv}_${part}.luks.gpg
         done
  }