Mise-à-jour : TODO .

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index 37e6dc1..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
        )
@@ -94,33 +94,24 @@ rule_luks_key_backup () { # SYNTAX: ${gpg_options:---recipient $USER@} DESCRIPTI
 
 rule_apache2_key_send () {
        local -; set +f
-       for conf in "$tool"/etc/apache2/site.d/*/VirtualHost.conf
-        do conf=${conf#"$tool"/etc/apache2/site.d/}
-               local port domain
-               IFS=. read -r port domain <<-EOF
-                       ${conf%/VirtualHost.conf}
-                       EOF
-               assert 'test "${port:+set}"'
-               assert 'test "${domain:+set}"'
-               local site="$port.$domain"
-               case $port in
-                (443)
-                       rule _x509_site_key_decrypt "$domain" |
-                       rule ssh -l root ' \
-                               sudo install -d -m 770 -o '"$user"' -g '"$user"' \
-                                /etc/apache2 \
-                                /etc/apache2/site.d/'"$site"' \
-                                /etc/apache2/site.d/'"$site"'/x509; \
-                               sudo install -m 644 -o '"$user"' -g '"$user"' /dev/stdin \
-                                /etc/apache2/site.d/'"$site"'/x509/.gitignore <<-EOF
-                                       key.pem
-                                       EOF
-                               sudo install -m 400 -o root -g root \
-                                /dev/stdin \
-                                /etc/apache2/'"'$site'"'/x509/key.pem
-                        '
-                       ;;
-                esac
+       for conf in "$tool"/etc/nginx/site.d/*/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"/x509_host)" |
+               rule ssh -l root ' \
+                       sudo install -d -m 770 -o '"$user"' -g '"$user"' \
+                        /etc/apache2 \
+                        /etc/apache2/x509.d \
+                        /etc/apache2/x509.d/'"$site"'; \
+                       sudo install -m 644 -o '"$user"' -g '"$user"' /dev/stdin \
+                        /etc/apache2/x509.d/'"$site"'/.gitignore <<-EOF
+                               key.pem
+                               EOF
+                       sudo install -m 400 -o root -g root \
+                        /dev/stdin \
+                        /etc/apache2/x509.d/'"'$site'"'/key.pem
+                '
         done
  }
 rule_dovecot_key_send () {
@@ -139,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 \
@@ -147,30 +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
-                       
-                       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"/x509_host
+                then
+                       rule _x509_site_key_decrypt \
+                        "$(cat "$tool"/etc/nginx/site.d/"$site"/x509_host)" |
+                       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 () {