X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_remote;h=0a7ef55389ad4c7cae45456c2964b91b2d8eec2c;hp=f951f3c6e0d9ee631a277e5794b122250644383a;hb=3e8f7fa8b58506dcb6b632855cfdb7da3b2b7ead;hpb=5b3f6649997abf4786ec2b1292abf712d4358567 diff --git a/vm_remote b/vm_remote index f951f3c..0a7ef55 100755 --- 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" ) } @@ -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,107 @@ 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_apache2_key_send () { + local -; set +f + 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 () { + rule _x509_site_key_decrypt imap."$vm_domainname" | + 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 + sudo install -m 400 -o root -g root \ + /dev/stdin \ + /etc/dovecot/"$vm_domainname"/imap/x509/key.pem + ' + } +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