Correction : vm_remote : uniformise rule_runit_configure avec vm_hosted .

[lhc/ateliers.git] / vm_remote

diff --git a/vm_remote b/vm_remote
index f951f3c..64f57df 100755 (executable)
--- a/vm_remote
+++ b/vm_remote
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
-tool=${0%/*}
+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 \
@@ -57,14 +56,24 @@ rule__ssh_known_hosts_update () {
         -o HashKnownHosts=no \
         whoami
  }
-rule_luks_key_send () { # NOTE: envoie la clef de déchiffrement des partitions au démarrage de la VM.
+
+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/"$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.
        gpg --decrypt var/sec/luks/$vm_fqdn.key.gpg |
        "$tool"/lib/ssh root@$vm_fqdn "$@" \
         -o CheckHostIP=no \
         -o HostKeyAlias=init.$vm_fqdn \
         tee /lib/cryptsetup/passfifo \>/dev/null
  }
-rule_luks_key_backup () { # NOTE: sauvegarde localement les entêtes des partitions chiffrées. ENVIRONMENT: $gpg_recipient
+rule_luks_key_backup () { # SYNTAX: ${gpg_options:---recipient $USER@} DESCRIPTION: sauvegarde localement les entêtes des partitions chiffrées.
+       test "${*+set}" || set -- --recipient "$USER@"
        for part in root var home
         do
                mkdir -p var/sec/luks
@@ -78,11 +87,55 @@ rule_luks_key_backup () { # NOTE: sauvegarde localement les entêtes des partiti
                        cat "$tmp";
                        shred >/dev/null --remove "$tmp"; \
                 ' |
-               gpg --encrypt --recipient "${gpg_recipient:-$USER@}" \
+               gpg "$@" --encrypt \
                 -o var/sec/luks/${vm_lvm_lv}_${part}.luks.gpg
         done
  }
 
+rule_gitolite_git () {
+       (
+       cd "$tool"/etc/gitolite
+       GIT_SSH=../../lib/ssh \
+       ssh-agent sh -c ' \
+               SSH_ASKPASS='"$tool"'/lib/ssh-pass \
+               SSH_ID=git \
+               ssh-add '"$tool"'/var/sec/ssh/git </dev/null && \
+               git '"$*"
+       )
+ }
+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__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}
 ${1+shift}
 case $rule in