Ajout : vm_hosted : lhc-remorque .

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index c167f30..57a3e96 100755 (executable)
--- a/vm_remote
+++ b/vm_remote
@@ -130,7 +130,7 @@ rule_dovecot_key_send () {
                 /etc/dovecot/"$vm_domainname"/imap/x509/key.pem
         '
  }
-rule_gitolite_configure () {
+rule_gitolite_git () {
        (
        cd "$tool"/etc/gitolite
        GIT_SSH=../../lib/ssh \
@@ -138,29 +138,33 @@ rule_gitolite_configure () {
                SSH_ASKPASS='"$tool"'/lib/ssh-pass \
                SSH_ID=git \
                ssh-add '"$tool"'/var/sec/ssh/git </dev/null && \
-               git push -v origin '"$*"
+               git '"$*"
        )
  }
-rule_nginx_key_send () {
+rule_nginx_configure () {
        local -; set +f
-       for conf in "$tool"/etc/nginx/site.d/*/key_send
+       for conf in "$tool"/etc/nginx/site.d/*/site.conf
         do conf=${conf#"$tool"/etc/nginx/site.d/}
-               local site=${conf%/key_send}
-               rule _x509_site_key_decrypt \
-                "$(cat "$tool"/etc/nginx/site.d/"$site"/key_send)" |
-               rule ssh -l root ' \
-                       sudo install -d -m 770 -o root -g root \
-                        /etc/nginx \
-                        /etc/nginx/x509.d \
-                        /etc/nginx/x509.d/'"'$site'"'; \
-                       sudo install -m 644 -o root -g root /dev/stdin \
-                        /etc/nginx/x509.d/'"'$site'"'/.gitignore <<-EOF
-                               key.pem
-                               EOF
-                       sudo install -m 400 -o root -g root \
-                        /dev/stdin \
-                        /etc/nginx/x509.d/'"'$site'"'/key.pem
-                '
+               local site="${conf%/site.conf}"
+               if test -f "$tool"/etc/nginx/site.d/"$site"/key_send
+                then
+                       rule _x509_site_key_decrypt \
+                        "$(cat "$tool"/etc/nginx/site.d/"$site"/key_send)" |
+                       rule ssh -l root ' \
+                               sudo install -d -m 770 -o root -g root \
+                                /etc/nginx \
+                                /etc/nginx/x509.d \
+                                /etc/nginx/x509.d/'"'$site'"'; \
+                               sudo install -m 644 -o root -g root /dev/stdin \
+                                /etc/nginx/x509.d/'"'$site'"'/.gitignore <<-EOF
+                                       key.pem
+                                       EOF
+                               sudo install -m 400 -o root -g root /dev/stdin \
+                                /etc/nginx/x509.d/'"'$site'"'/key.pem
+                        '
+                fi
+               test ! -r "$tool"/etc/nginx/site.d/"$site"/remote.sh ||
+               .         "$tool"/etc/nginx/site.d/"$site"/remote.sh
         done
  }
 rule_postfix_key_send () {