Mise-à-jour : TODO .

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index 57a3e96..0a7ef55 100755 (executable)
--- a/vm_remote
+++ b/vm_remote
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
-tool=$(cd "${0%/*}"; cd -)
+tool=$(readlink -e "${0%/*}")
 . "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 
@@ -27,10 +27,10 @@ rule_git_configure () { # DESCRIPTION: configure ./.git correctement
        (
        cd "$tool"
        git remote rm host || true
-       git remote add host $vm_host:tool/vm
+       git remote add host $vm_host:src/vm
        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 remote add hosted $vm_fqdn:src/vm
        git config --replace remote.hosted.push HEAD:refs/remotes/master
        git submodule update --init
        )
@@ -98,7 +98,7 @@ rule_apache2_key_send () {
         do conf=${conf#"$tool"/etc/nginx/site.d/}
                local site=${conf%/key_send}
                rule _x509_site_key_decrypt \
-                "$(cat "$tool"/etc/apache2/site.d/"$site"/key_send)" |
+                "$(cat "$tool"/etc/apache2/site.d/"$site"/x509_host)" |
                rule ssh -l root ' \
                        sudo install -d -m 770 -o '"$user"' -g '"$user"' \
                         /etc/apache2 \
@@ -146,10 +146,10 @@ rule_nginx_configure () {
        for conf in "$tool"/etc/nginx/site.d/*/site.conf
         do conf=${conf#"$tool"/etc/nginx/site.d/}
                local site="${conf%/site.conf}"
-               if test -f "$tool"/etc/nginx/site.d/"$site"/key_send
+               if test -f "$tool"/etc/nginx/site.d/"$site"/x509_host
                 then
                        rule _x509_site_key_decrypt \
-                        "$(cat "$tool"/etc/nginx/site.d/"$site"/key_send)" |
+                        "$(cat "$tool"/etc/nginx/site.d/"$site"/x509_host)" |
                        rule ssh -l root ' \
                                sudo install -d -m 770 -o root -g root \
                                 /etc/nginx \