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

diff --git a/vm_remote b/vm_remote
index 237f421..1a599dc 100755
--- a/vm_remote
+++ b/vm_remote
@@ -13,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
  }
 
@@ -26,15 +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: {host|vm} $git_commit_options
 	local remote=${1#remote=}; shift
-	git add . &&
-	git commit -a -C HEAD "$@" &&
 	GIT_SSH=./vm_ssh git push -v -f "$remote"
  }
 
@@ -59,7 +57,7 @@ rule_disk_key_backup () {
 	for part in root var home
 	 do
 		mkdir -p var/lib/luks
-		rule_ssh -l root ' \
+		rule ssh -l root ' \
 			tmp=$(mktemp)
 			cryptsetup luksHeaderBackup \
 			 /dev/$vm_lvm_vg/${vm_lvm_lv}_${part} \
@@ -77,9 +75,8 @@ ${1+shift}
 case $rule in
  (help);;
  (*)
-	test ! "$(hostname --fqdn)" = "$vm_fqdn"
-	test ! "$(hostname --fqdn)" = "$vm_host"
-	set "${TRACE:+-x}"
+	assert 'test ! "$(hostname --fqdn)" = "$vm_fqdn"' vm_fqdn
+	assert 'test ! "$(hostname --fqdn)" = "$vm_host"' vm_host
 	;;
  esac
-rule_$rule "$@"
+rule $rule "$@"