Ajout : réorganisation et ébauche X509.

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index 56e1ee0..925f1a9 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
-. "$tool"/functions.sh
-. "$tool"/vm.sh
+. "$tool"/lib/functions.sh
+. "$tool"/etc/vm.sh
 test "$(hostname --fqdn)" = "$vm_fqdn"
 
 rule_help () {
@@ -229,7 +229,7 @@ rule__user_root_init () {
                        EOF
         done |
        mk_reg mod=640 own=root:root /root/etc/ssh/authorized_keys
-       sudo find "$tool"/key -type f -name '*.gpg.pub' -exec gpg --import {} \;
+       sudo find "$tool"/var/pub/openpgp -type f -name '*.key' -exec gpg --import {} \;
  }
 rule__initramfs_init () {
        mk_reg mod=644 own=root:root /etc/initramfs-tools/initramfs.conf <<-EOF
@@ -265,13 +265,13 @@ rule__initramfs_init () {
        #mk_reg mod=640 own=root:root </dev/null \
        # /etc/initramfs-tools/etc/dropbear/dropbear_dss_host_key \
        # /etc/initramfs-tools/etc/dropbear/dropbear_dss_host_key.pub
-       ssh-keygen -F "init.$vm_fqdn" -f "$tool"/key/ssh.known_hosts |
+       ssh-keygen -F "init.$vm_fqdn" -f "$tool"/etc/openssh/known_hosts |
        ( while IFS= read -r line
         do case $line in (*" RSA") return 0; break;; esac
         done; return 1 ) ||
        sudo dropbearkey -t rsa -s 4096 -f \
         /etc/initramfs-tools/etc/dropbear/dropbear_rsa_host_key
-       ssh-keygen -F "init.$vm_fqdn" -f "$tool"/key/ssh.known_hosts |
+       ssh-keygen -F "init.$vm_fqdn" -f "$tool"/etc/openssh/known_hosts |
        ( while IFS= read -r line
         do case $line in (*" DSA") return 0; break;; esac
         done; return 1 ) ||
@@ -348,7 +348,7 @@ rule_user_init () {
        mk_dir mod=700 own="root:adm" /etc/skel/tmp
        mk_lnk etc/ssh                /etc/skel/.ssh
        mk_lnk etc/gpg                /etc/skel/.gnupg
-       ssh-keygen -F "$vm_fqdn" -f "$tool"/key/ssh.known_hosts |
+       ssh-keygen -F "$vm_fqdn" -f "$tool"/etc/openssh/known_hosts |
        ( while IFS= read -r line
         do case $line in (*" RSA") return 0; break;; esac
         done; return 1 ) ||
@@ -428,10 +428,10 @@ rule_user_admin_add () { # SYNTAX: $user
                # NOTE: le mot-de-passe doit être initialisé par l'utilisateur à l'aide de passwd-init .
        eval local home\; home="~$user"
        sudo adduser "$user" sudo
-       ssh_key_add user=$user "$tool"/key/"$user".ssh.pub "$home"/etc/ssh/authorized_keys
+       ssh_key_add user=$user "$tool"/var/pub/ssh/"$user".key "$home"/etc/ssh/authorized_keys
        rule__initramfs_init
        rule__user_root_init
-       sudo gpg --import "$tool"/key/"$user".gpg.pub
+       sudo gpg --import "$tool"/var/pub/opengpg/"$user".key
  }
 rule_user_mail_format () {
        mk_dir mod=770 own=root:adm /etc/skel/etc/procmail