X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_remote;fp=vm_remote;h=58778026c548a8e25d2609af2c34e4af9f0a0126;hp=7601a016c6d09a715a77e9d23ecd2e96bd41633b;hb=7313fbbd10b0321c3e460639137f0e0e9ed9dcad;hpb=b29eee4bccda9713ca66f55f8ac382e688d5078c

diff --git a/vm_remote b/vm_remote
index 7601a01..5877802 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"/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
@@ -35,16 +35,19 @@ rule_git_config () { # DESCRIPTION: configure le .git local pour bien pousser
 	)
  }
 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 \
@@ -53,14 +56,14 @@ rule__ssh_known_hosts_update () {
 	 -o HashKnownHosts=no \
 	 whoami
  }
-rule_key_disk_send () {
+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"/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 () { # NOTE: sauvegarde localement les entêtes des partitions chiffrées. ENVIRONMENT: $gpg_recipient
 	for part in root var home
 	 do
 		mkdir -p var/sec/luks
@@ -74,7 +77,7 @@ rule_key_disk_backup () {
 			cat "$tmp";
 			shred >/dev/null --remove "$tmp"; \
 		 ' |
-		gpg --encrypt --recipient $USER@ \
+		gpg --encrypt --recipient "${gpg_recipient:-$USER@}" \
 		 -o var/sec/luks/${vm_lvm_lv}_${part}.luks.gpg
 	 done
  }