X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=README;h=be0145ebbe7b993e4231ee25d3ed90639ad253f1;hp=4a5f9cc6c3e14df075e3d6225b3da65dfa3a4531;hb=3ad6118386977e346d81042e924e5db9c5f15b7d;hpb=22f04b9fac14adc3d3fc98273ba126c3a51792c3

diff --git a/README b/README
index 4a5f9cc..be0145e 100644
--- a/README
+++ b/README
@@ -25,12 +25,12 @@ TASK: obtenir une installation chrootable
 TASK: obtenir une installation démarable
 	@host % ~/tool/ateliers/vm_host chroot
 	@host % export TRACE=1 LANG=C LC_CTYPE=C
-	@host % /root/tool/vm/vm_hosted init
+	@host % /root/tool/vm/local/init # TODO: revoir ça
 	@host % exit
 TASK: initialiser la VM
-	@host   % ~/tool/ateliers/vm_host vm_configure
-	@host   % ~/tool/ateliers/vm_host vm_start
-	@hosted % vm_hosted user_configure
+	@host  % ~/tool/ateliers/vm_host vm_configure
+	@host  % ~/tool/ateliers/vm_host vm_start
+	@local % local/user-configure
 TASK: démarrer la VM
 	@host   % vm_host vm_start
 TASK: ajouter un-e administrateurice $user
@@ -38,17 +38,17 @@ TASK: ajouter un-e administrateurice $user
 	@remote % gpg --armor --export --export-options export-clean >var/pub/openpgp/$user.key
 	@remote % git add var/pub/{openpgp,ssh}/$user.key
 	@remote % git commit -a -m "Ajout : admin : $user ."
-	@remote % ./vm_remote git_push
-	@hosted % vm_hosted git_reset
-	@hosted % vm_hosted user_admin_add $user
+	@remote % remote/git-push
+	@local  % local/git-reset
+	@local  % local/user-admin-add $user
 TASK: démarrer la VM
 	@host   % vm_host vm_start
-	@remote % ./vm_remote key_disk_send
+	@remote % remote/luks-key-disk-send
 TASK: pousser des changements locaux sur la VM
-	@remote % ./vm_remote push hosted
-	@hosted % vm_hosted git_reset
+	@remote % remote/git-push
+	@local  % local/git-reset
 TASK: se connecter interactivement en root à la VM avec une connection SSH persistante
-	@remote % ./vm_remote mosh -l root
+	@remote % remote/mosh -l root
 TASK: générer une autorité de certification et des sous-certificats TLS
 	% export TRACE=all
 	% random=/dev/urandom gpg_options="-r $USER@ -r $SOME_OTHER_USER@" lib/tool/openssl/make etc/openssl/heureux-cyclage.org
@@ -58,11 +58,11 @@ TASK: gérer gitolite
 	% cd etc/gitolite
 	% vim conf/gitolite.conf
 	% git commit
-	% ../../vm_remote gitolite_push
+	% ../../remote/gitolite-push
 TASK: configurer une zone DNS
-	@hosted % vm runit_configure nsd3 -- heureux-cyclage.org
+	@local % local/runit-configure nsd3 -- heureux-cyclage.org
 TASK: configurer un membre du groupe php5-fpm
-	@remote % ./vm_remote runit_configure nginx -- lhc_www
-	@hosted % vm_hosted   runit_configure nginx -- lhc_www
+	@remote % remote/runit-configure nginx -- lhc_www
+	@local  %  local/runit-configure nginx -- lhc_www
 TASK: configurer un site nginx
-	@hosted % vm_hosted runit_configure nginx -- lhc_www
+	@local % local/runit-configure nginx -- lhc_www