X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=db7247a4ac14aac573bdf700d6a8cd0de3689fc7;hb=fdea46138aab165fff4ba27888c354c87190de9a;hp=56e1ee06dbf4b56a6c7f2cf6c2e709e5e184339f;hpb=1f1550e467bccfbac8a8f88b93db6355745794be;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index 56e1ee0..db7247a 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -1,9 +1,8 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
-. "$tool"/functions.sh
-. "$tool"/vm.sh
-test "$(hostname --fqdn)" = "$vm_fqdn"
+. "$tool"/lib/functions.sh
+. "$tool"/etc/vm.sh
 
 rule_help () {
 	cat >&2 <<-EOF
@@ -229,7 +228,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 +264,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 +347,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 +427,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
@@ -800,5 +799,11 @@ rule_mail_install () {
 
 rule=${1:-help}
 ${1+shift}
-set "${TRACE:+-x}"
+case $rule in
+ (help);;
+ (*)
+	test "$(hostname --fqdn)" = "$vm_fqdn"
+	set "${TRACE:+-x}"
+	;;
+ esac
 rule_$rule "$@"