Correction : vm_{hosted,remote} : chemins et noms, suite.

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index 37e6dc1..c167f30 100755 (executable)
--- a/vm_remote
+++ b/vm_remote
@@ -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"/key_send)" |
+               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 () {
@@ -166,8 +157,7 @@ rule_nginx_key_send () {
                         /etc/nginx/x509.d/'"'$site'"'/.gitignore <<-EOF
                                key.pem
                                EOF
-                       
-                       install -m 400 -o root -g root \
+                       sudo install -m 400 -o root -g root \
                         /dev/stdin \
                         /etc/nginx/x509.d/'"'$site'"'/key.pem
                 '