Correction : vm_remote : uniformise rule_runit_configure avec vm_hosted .
[lhc/ateliers.git] / vm_remote
index b7ce833..64f57df 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
        )
@@ -40,7 +40,6 @@ rule_git_push () { # SYNTAX: {host|hosted} $git_push_options
        cd "$tool"
        local remote=${1#remote=}; shift
        GIT_SSH=./lib/ssh git push -v "$remote" "$@"
-       info "penser à faire : vm_hosted git_reset"
        )
  }
 
@@ -48,7 +47,7 @@ rule_ssh () {
        "$tool"/lib/ssh $vm_fqdn "$@"
  }
 rule_mosh () {
-       mosh --ssh="$tool/lib/ssh $*" $vm_fqdn
+       mosh --ssh="$tool/lib/ssh ${ssh-}" -- $vm_fqdn "$@"
  }
 rule__ssh_known_hosts_update () {
        rule ssh \
@@ -58,18 +57,12 @@ rule__ssh_known_hosts_update () {
         whoami
  }
 
-rule__x509_service_key_send_deciphered () { # SYNTAX: $service $remote_destination ${ssh_options-}
-       local service="$1"; shift
-       local remote_destination="$1"; shift
-       gpg --decrypt "var/sec/x509/$vm_domainname/$service/key.pass.gpg" |
+rule__x509_site_key_decrypt () { # SYNTAX: $site
+       local site="$1"; shift
+       gpg --decrypt "$tool"/var/sec/x509/"$site"/key.pass.gpg |
        openssl rsa -passin 'stdin' \
-        -in  "var/sec/x509/$vm_domainname/$service/key.pem" \
-        -out '/dev/stdout' |
-       rule ssh "$@"  ' \
-               install -m 400 -o root -g root \
-                /dev/stdin \
-                '"$remote_destination"' \
-        '
+        -in  var/sec/x509/"$site"/key.pem \
+        -out '/dev/stdout'
  }
 
 rule_luks_key_send () { # DESCRIPTION: envoie la clef de déchiffrement des partitions au démarrage de la VM.
@@ -99,52 +92,7 @@ rule_luks_key_backup () { # SYNTAX: ${gpg_options:---recipient $USER@} DESCRIPTI
         done
  }
 
-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 user port service site
-               IFS=. read -r user port service site <<-EOF
-                       ${conf%\/VirtualHost\.conf}
-                       EOF
-               assert 'test "${user:+set}"'
-               assert 'test "${service:+set}"'
-               assert 'test "${site:+set}"'
-               assert 'test "${port:+set}"'
-               local site_dir="$user.$port.$service.$site"
-               case $port in
-                (443)
-                       rule ssh -l root ' \
-                               sudo install -d -m 770 -o '"$user"' -g '"$user"' \
-                                /etc/apache2 \
-                                /etc/apache2/site.d/'"$site_dir"' \
-                                /etc/apache2/site.d/'"$site_dir"'/x509; \
-                               sudo install -m 644 -o '"$user"' -g '"$user"' /dev/stdin \
-                                /etc/apache2/site.d/'"$site_dir"'/x509/.gitignore <<-EOF
-                                       key.pem
-                                       EOF
-                        '
-                       rule _x509_service_key_send_deciphered $service \
-                        ~"$user"/etc/apache2/"$site_dir"/x509/key.pem -l root "$@"
-                       ;;
-                esac
-        done
- }
-rule_dovecot_key_send () {
-       rule ssh -l root ' \
-               sudo install -d -m 770 -o root -g root \
-                /etc/dovecot/'"$vm_domainname"'/ \
-                /etc/dovecot/'"$vm_domainname"'/imap \
-                /etc/dovecot/'"$vm_domainname"'/imap/x509 ; \
-               sudo install -m 644 -o root -g root /dev/stdin \
-                /etc/dovecot/'"$vm_domainname"'/imap/x509/.gitignore <<-EOF
-                       key.pem
-                       EOF
-        '
-       rule _x509_service_key_send_deciphered imap \
-        /etc/dovecot/$vm_domainname/$service/x509/key.pem -l root "$@"
- }
-rule_gitolite_configure () {
+rule_gitolite_git () {
        (
        cd "$tool"/etc/gitolite
        GIT_SSH=../../lib/ssh \
@@ -152,58 +100,40 @@ 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 () {
-       local -; set +f
-       for conf in "$tool"/etc/nginx/site.d/*/server.conf
-        do conf=${conf#"$tool"/etc/nginx/site.d/}
-               local user port service site
-               IFS=. read -r user port service site <<-EOF
-                       ${conf%\/server\.conf}
-                       EOF
-               assert 'test "${user:+set}"'
-               assert 'test "${service:+set}"'
-               assert 'test "${site:+set}"'
-               assert 'test "${port:+set}"'
-               local site_dir="$user.$port.$service.$site"
-               case $port in
-                (443)
-                       rule ssh -l root ' \
-                               sudo install -d -m 770 -o root -g root \
-                                /etc/nginx \
-                                /etc/nginx/site.d \
-                                /etc/nginx/site.d/'"$site_dir"' \
-                                /etc/nginx/site.d/'"$site_dir"'/x509; \
-                               sudo install -m 644 -o root -g root /dev/stdin \
-                                /etc/nginx/site.d/'"$site_dir"'/x509/.gitignore <<-EOF
-                                       key.pem
-                                       EOF
-                        '
-                       rule _x509_service_key_send_deciphered $service \
-                        /etc/nginx/"$site_dir"/x509/key.pem -l root "$@"
-                       ;;
-                esac
-        done
+rule_runit_configure () { # SYNTAX: $sv [...] -- $configure_options
+       if test $# = 0
+        then
+               set +x
+               rule ssh sudo sv status \
+                $(sudo find /etc/sv \
+                -mindepth 1 -maxdepth 1 -type d \
+                -printf '%p\n' | sort)
+        else
+               local services=
+               while [ $# -gt 0 ]
+                do case $1 in
+                        (--) shift; break;;
+                        (*) services="$services $1"; shift;;
+                        esac
+                done
+               for sv in $(find "$tool"/etc/sv \
+                -mindepth 1 -maxdepth 1 -type d \
+                -false $(printf -- '-or -name %s\n' $services) \
+                -printf '%f\n')
+                do
+                       rule _runit_sv_configure "$sv" "$@"
+                done
+        fi
  }
-rule_postfix_key_send () {
-       rule ssh -l root ' \
-               sudo install -d -m 770 -o root -g root \
-                /etc/postfix/'"$vm_domainname"'/ \
-                /etc/postfix/'"$vm_domainname"'/smptd \
-                /etc/postfix/'"$vm_domainname"'/smptd/x509; \
-               sudo install -m 644 -o root -g root /dev/stdin \
-                /etc/postfix/'"$vm_domainname"'/smtp/x509/.gitignore <<-EOF
-                       key.pem
-                       EOF
-               sudo install -m 644 -o root -g root /dev/stdin \
-                /etc/postfix/'"$vm_domainname"'/smtpd/x509/.gitignore <<-EOF
-                       key.pem
-                       EOF
-        '
-       rule _x509_service_key_send_deciphered smtpd \
-        /etc/postfix/$vm_domainname/smtpd/x509/key.pem -l root "$@"
+rule__runit_sv_configure () { # SYNTAX: $sv $configure_options
+       local sv="$1"; shift
+       (
+       test ! -r "$tool"/etc/sv/"$sv"/remote.sh ||
+       .         "$tool"/etc/sv/"$sv"/remote.sh || return 1
+       )
  }
 
 rule=${1:-help}