X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=81dec85202729227e12b8211d8b3212819ddbf81;hb=fb16412c2b5c7d0264df73c117399ff244a4abee;hp=8afa6b4b0432defaa7114a7b9a0c3c7a6e2874a7;hpb=fe76c838090f262ec477c6a73d1bf9d988033b56;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index 8afa6b4..81dec85 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -32,18 +32,18 @@ rule_git_config () {
 rule_git_reset () {
 	(
 	cd "$tool"
-	git checkout -f -B master origin
+	git checkout -f -B master remotes/master
 	git clean -f -d -x
 	)
  }
 
-rule_chrooted () {
+rule__chrooted_configure () { # NOTE: est-ce bien utile à un moment ?
 	export LANG=C
 	export LC_CTYPE=C
 	. /etc/profile
  }
 
-rule_apt_init () {
+rule_apt_configure () {
 	mk_reg mod= own= /etc/apt/sources.list <<-EOF
 		deb http://ftp.fr.debian.org/debian $vm_lsb_name main contrib non-free
 		EOF
@@ -63,7 +63,7 @@ rule_apt_init () {
 		deb http://nightly.openerp.com/trunk/nightly/deb/ ./
 		EOF
  }
-rule_apticron_init () {
+rule_apticron_configure () {
 	sudo apt-get install --reinstall apticron
 	mk_reg mod=644 own=root:root /etc/apticron/apticron.conf <<-EOF
 		EMAIL="admin@heureux-cyclage.org"
@@ -82,7 +82,7 @@ rule_apticron_init () {
 		EOF
 	sudo service apticron restart
  }
-rule_boot_init () {
+rule_boot_configure () {
 	sudo apt-get install --reinstall grub-pc # XXX: attention à n'installer GRUB sur AUCUN disque proposé !
 	mk_dir mod=644 own=root:root /boot/grub
 	sudo apt-get install --reinstall linux-image-$vm_arch
@@ -100,9 +100,9 @@ rule_boot_init () {
 		(hd0)   /dev/mapper/domU-$(printf %s $vm_fqdn-disk | sed -e 's/-/--/g')
 		EOF
 	sudo update-grub2 # NOTE: prend en compte /boot/grub/device.map
-	rule initramfs_init
+	rule initramfs_configure
  }
-rule_etckeeper_init () {
+rule_etckeeper_configure () {
 	mk_reg mod=644 own=root:root /etc/etckeeper/etckeeper.conf <<-EOF
 		VCS=git
 		GIT_COMMIT_OPTIONS=""
@@ -113,7 +113,7 @@ rule_etckeeper_init () {
 		LOWLEVEL_PACKAGE_MANAGER=dpkg
 		EOF
  }
-rule_filesystem_init () {
+rule_filesystem_configure () {
 	mk_reg mod=644 own=root:root /etc/fstab <<-EOF
 		# <file system> <mount point> <type> <options> <dump> <pass>
 		LABEL=${vm_lvm_lv}_boot /boot ext2 defaults 0 0
@@ -137,7 +137,7 @@ rule_filesystem_init () {
 		vm.vfs_cache_pressure=50
 		EOF
  }
-rule_initramfs_init () {
+rule_initramfs_configure () {
 	mk_reg mod=644 own=root:root /etc/initramfs-tools/initramfs.conf <<-EOF
 		MODULES=most
 		BUSYBOX=y
@@ -163,23 +163,18 @@ rule_initramfs_init () {
 	sudo sed -e '/^configure_networking /s/ &$//' \
 	 -i /usr/share/initramfs-tools/scripts/init-premount/dropbear
 	 # NOTE: corrige une vermine : dropbear doit attendre que le réseau soit configuré..
-	sudo rm -f \
-	 /etc/initramfs-tools/etc/dropbear/dropbear_dss_host_key \
-	 /etc/initramfs-tools/etc/dropbear/dropbear_dss_host_key.pub \
-	 /etc/initramfs-tools/etc/dropbear/dropbear_rsa_host_key \
-	 /etc/initramfs-tools/etc/dropbear/dropbear_rsa_host_key.pub
 	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 rm -f \
+	 /etc/initramfs-tools/etc/dropbear/dropbear_rsa_host_key \
+	 /etc/initramfs-tools/etc/dropbear/dropbear_rsa_host_key.pub
 	sudo dropbearkey -t rsa -s 4096 -f \
 	 /etc/initramfs-tools/etc/dropbear/dropbear_rsa_host_key
-	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 ) ||
-	sudo dropbearkey -t dss -s 1024 -f \
-	 /etc/initramfs-tools/etc/dropbear/dropbear_dss_host_key
+	 }
+	# NOTE: ne se préoccupe pas de dropbear_dss_host_key ; Debian la génère et l'utilise néamoins.
 	mk_dir mod=640 own=root:root \
 	 /etc/initramfs-tools/root \
 	 /etc/initramfs-tools/root/.ssh
@@ -200,13 +195,13 @@ rule_initramfs_init () {
 	 # NOTE: clefs générées par Debian
 	sudo update-initramfs -u
  }
-rule_locale_init () {
+rule_locale_configure () {
 	mk_reg mod=644 own=root:root /etc/locale.gen <<-EOF
 		fr_FR.UTF-8 UTF-8
 		EOF
 	sudo update-locale
  }
-rule_login_init () {
+rule_login_configure () {
 	grep -q '^hvc0$' /etc/securetty ||
 	mk_reg mod= own= --append /etc/securetty <<-EOF
 		hvc0
@@ -300,7 +295,7 @@ rule_login_init () {
 		session optional pam_umask.so
 		EOF
  }
-rule_network_init () {
+rule_network_configure () {
 	mk_reg mod= own= /etc/hostname <<-EOF
 		$vm
 		EOF
@@ -324,7 +319,7 @@ rule_network_init () {
 		    pre-down  ip address delete $vm_ipv4/32 dev \$IFACE
 		EOF
  }
-rule_user_init () {
+rule_user_configure () {
 	mk_dir mod=750 own="root:adm" /etc/skel/etc
 	mk_dir mod=770 own="root:adm" /etc/skel/etc/apache2
 	mk_dir mod=770 own="root:adm" /etc/skel/etc/ssh
@@ -409,7 +404,7 @@ rule_user_init () {
 		  'case \$(/usr/bin/passwd --status "\$SUDO_USER") in ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac'
 		EOF
  }
-rule_user_root_init () {
+rule_user_root_configure () {
 	mk_dir mod=750 own=root:root /root/etc
 	mk_dir mod=750 own=root:root /root/etc/ssh
 	mk_dir mod=750 own=root:root /root/etc/gpg
@@ -425,30 +420,34 @@ rule_user_root_init () {
 		 done
 	 done |
 	mk_reg mod=640 own=root:root /root/etc/ssh/authorized_keys
-	local key
+	local key; local -; set +f
 	for key in "$tool"/var/pub/openpgp/*.key
 	 do sudo gpg --import "$key"
 	 done
  }
-rule_bin_init () {
+rule_bin_configure () {
 	mk_lnk "$tool"/vm_hosted /usr/local/sbin/
  }
-rule_init () {
-	rule etckeeper_init
-	rule locale_init
-	rule network_init
-	rule apt_init
-	rule filesystem_init
-	rule login_init
-	rule user_root_init
-	rule boot_init
-	rule bin_init
+rule_configure () {
+	rule etckeeper_configure
+	rule locale_configure
+	rule network_configure
+	rule apt_configure
+	rule filesystem_configure
+	rule login_configure
+	rule user_root_configure
+	rule boot_configure
+	rule bin_configure
  }
 
 rule_disk_key_change () {
 	sudo cryptsetup luksChangeKey /dev/$vm_lvm_vg/${vm_lvm_lv}_root
  }
 
+rule_user_admin_configure () {
+	rule initramfs_configure
+	rule user_root_configure
+ }
 rule_user_admin_add () { # SYNTAX: $user
 	local user=$1
 	id "$user" >/dev/null ||
@@ -458,12 +457,11 @@ rule_user_admin_add () { # SYNTAX: $user
 	sudo adduser "$user" sudo
 	mk_reg mod=640 own=$user:$user "$home"/etc/ssh/authorized_keys \
 	 <"$tool"/var/pub/ssh/"$user".key
-	rule initramfs_init
-	rule user_root_init
 	local key; local -; set +f
 	for key in "$tool"/var/pub/openpgp/*.key
 	 do sudo -u "$user" gpg --import "$key"
 	 done
+	rule user_admin_configure
  }
 rule_user_mail_format () {
 	mk_dir mod=770 own=root:adm /etc/skel/etc/procmail
@@ -826,7 +824,7 @@ rule_user_mail_format () {
 	mk_reg mod=664 own=root:root /etc/postgrey/whitelist_recipients.local <<-EOF
 		EOF
  }
-rule_mail_init () {
+rule_mail_configure () {
 	sudo apt-get install postfix postgrey dovecot
  }
 
@@ -836,7 +834,6 @@ case $rule in
  (help);;
  (*)
 	assert 'test "$(hostname --fqdn)" = "$vm_fqdn"' vm_fqdn
-	${TRACE:+set -x}
 	;;
  esac
 rule $rule "$@"