Modification : rule_*_init -> rule_*_configure .
[lhc/ateliers.git] / vm_hosted
index a630d12..a92477c 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -4,77 +4,46 @@ tool=${0%/*}
 . "$tool"/lib/functions.sh
 . "$tool"/etc/vm.sh
 
-rule_help () {
+rule_help () { # SYNTAX: [--hidden]
+       local hidden; [ ${1:+set} ] || hidden=set
        cat >&2 <<-EOF
-               DESCRIPTION: ce script regroupe des fonctions utilitaires
-                            pour gérer la VM _depuis_ la VM hébergée ;
-                            il sert à la fois d'outil et de documentation.
-                            Voir \`$tool/vm_host' pour les utilitaires côté machine hôte.
+               DESCRIPTION:
+                 ce script regroupe des règles pour administrer la VM ($vm_fqdn)
+                 _depuis_ la VM hébergée ($vm_fqdn) ;
+                 il sert à la fois d'outil (aisément bidouillable)
+                 et de documentation (préçise).
+                 Voir \`$tool/vm_host' pour les règles côté machine hôte ($vm_host).
                SYNTAX: $0 \$RULE \${RULE}_SYNTAX
                RULES:
-               $(sed -ne 's/^rule_\([^_][^ ]*\) () {\( *#.*\|\)/\t\1\2/p' "$tool"/vm.sh "$0")
+               $(sed -ne "s/^rule_\(${hidden:+[^_]}[^ ]*\) () {\( *#.*\|\)/  \1\2/p" "$tool"/etc/vm.sh "$0")
                ENVIRONMENT:
                  TRACE # affiche les commandes avant leur exécution
-               $(sed -ne 's/^readonly \([^ ][^ =]*\).*}\( *#.*\|\)$/\t$\1\2/p' "$tool"/vm.sh "$0")
+               $(sed -ne 's/^readonly \([^ ][^ =]*\).*}\( *#.*\|\)$/\t$\1\2/p' "$tool"/etc/vm.sh "$0")
                EOF
  }
 
+rule_git_config () {
+       (
+       cd "$tool"
+       git config --replace branch.master.remote .
+       git config --replace branch.master.merge refs/remotes/master
+       )
+ }
 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__etckeeper_init () {
-       mk_reg mod=644 own=root:root /etc/etckeeper/etckeeper.conf <<-EOF
-               VCS=git
-               GIT_COMMIT_OPTIONS=""
-               AVOID_DAILY_AUTOCOMMITS=1
-               #AVOID_SPECIAL_FILE_WARNING=1
-               AVOID_COMMIT_BEFORE_INSTALL=1
-               HIGHLEVEL_PACKAGE_MANAGER=apt
-               LOWLEVEL_PACKAGE_MANAGER=dpkg
-               EOF
- }
-rule__locale_init () {
-       mk_reg mod=644 own=root:root /etc/locale.gen <<-EOF
-               fr_FR.UTF-8 UTF-8
-               EOF
-       sudo update-locale
- }
-rule__network_init () {
-       mk_reg mod= own= /etc/hostname <<-EOF
-               $vm
-               EOF
-       grep -q " $vm\$" /etc/hosts ||
-       mk_reg mod= own= --append /etc/hosts <<-EOF
-               127.0.0.1 $vm_fqdn $vm
-               EOF
-       mk_reg mod= own= /etc/network/interfaces <<-EOF
-               auto lo
-               iface lo inet loopback
-               
-               auto eth0=grenode
-               iface grenode inet static
-                   address   $vm_ipv4
-                   gateway   $vm_ipv4 # NOTE: proxy_arp sur la passerelle permet d'utiliser la même adresse
-                   network   $vm_ipv4
-                   broadcast $vm_ipv4
-                   netmask   255.255.255.255
-                   #mtu 1300
-                   post-up   ip address add    $vm_ipv4/32 dev \$IFACE
-                   pre-down  ip address delete $vm_ipv4/32 dev \$IFACE
-               EOF
- }
-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
@@ -94,7 +63,57 @@ rule__apt_init () {
                deb http://nightly.openerp.com/trunk/nightly/deb/ ./
                EOF
  }
-rule__filesystem_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"
+               # DIFF_ONLY="1"
+               # LISTCHANGES_PROFILE="apticron"
+               # ALL_FQDNS="1"
+               # SYSTEM="foobar.example.com"
+               # IPADDRESSNUM="1"
+               # IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
+               # NOTIFY_HOLDS="0"
+               # NOTIFY_NEW="0"
+               # NOTIFY_NO_UPDATES="0"
+               # CUSTOM_SUBJECT=""
+               # CUSTOM_NO_UPDATES_SUBJECT=""
+               # CUSTOM_FROM="root@ateliers.heureux-cyclage.org"
+               EOF
+       sudo service apticron restart
+ }
+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
+       mk_reg mod=644 own=root:root /etc/default/grub <<-EOF
+               GRUB_DEFAULT=0
+               GRUB_TIMEOUT=5
+               GRUB_DISTRIBUTOR=\`lsb_release -i -s 2> /dev/null || echo Debian\`
+               GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+               GRUB_CMDLINE_LINUX="vt.default_utf8=1 rootfstype=ext4 loglevel=5 console=hvc0 ip=$vm_ipv4::$vm_ipv4:255.255.255.254:$vm:eth0:off resume=/dev/mapper/${vm}_swap_deciphered"
+               GRUB_DISABLE_RECOVERY="true"
+               #GRUB_PRELOAD_MODULES="lvm"
+               EOF
+       mk_reg mod=644 own=root:root /boot/grub/device.map <<-EOF
+               (hd0)   /dev/xvda
+               (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_configure
+ }
+rule_etckeeper_configure () {
+       mk_reg mod=644 own=root:root /etc/etckeeper/etckeeper.conf <<-EOF
+               VCS=git
+               GIT_COMMIT_OPTIONS=""
+               AVOID_DAILY_AUTOCOMMITS=1
+               #AVOID_SPECIAL_FILE_WARNING=1
+               AVOID_COMMIT_BEFORE_INSTALL=1
+               HIGHLEVEL_PACKAGE_MANAGER=apt
+               LOWLEVEL_PACKAGE_MANAGER=dpkg
+               EOF
+ }
+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
@@ -118,12 +137,81 @@ rule__filesystem_init () {
                vm.vfs_cache_pressure=50
                EOF
  }
-rule__login_init () {
-       grep -q hvc0 /etc/securetty ||
+rule_initramfs_configure () {
+       mk_reg mod=644 own=root:root /etc/initramfs-tools/initramfs.conf <<-EOF
+               MODULES=most
+               BUSYBOX=y
+               KEYMAP=y
+               COMPRESS=gzip
+               DEVICE=eth0
+               EOF
+       mk_reg mod=644 own=root:root /etc/modprobe.d/xen-pv.conf <<-EOF
+               alias eth0 xennet
+               alias scsi_hostadapter xenblk
+               EOF
+       mk_reg mod=644 own=root:root /etc/modules <<-EOF
+               sha1_generic
+               sha256_generic
+               sha512_generic
+               aes-x86_64
+               xts
+               # NOTE: pour Xen en mode HVM :
+               #modprobe xen-platform-pci
+               EOF
+       mk_reg mod=644 own=root:root /etc/initramfs-tools/modules <<-EOF
+               EOF
+       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 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
+       mk_dir mod=640 own=root:root \
+        /etc/initramfs-tools/root \
+        /etc/initramfs-tools/root/.ssh
+       getent group sudo |
+       while IFS=: read -r group x x users
+        do while test -n "$users" && IFS=, read -r user users <<-EOF
+                       $users
+                       EOF
+                do eval local home\; home="~$user"
+                       cat "$home"/etc/ssh/authorized_keys
+                done
+        done |
+       mk_reg mod=644 own=root:root /etc/initramfs-tools/root/.ssh/authorized_keys
+       sudo rm -f \
+        /etc/initramfs-tools/root/.ssh/id_rsa.dropbear \
+        /etc/initramfs-tools/root/.ssh/id_rsa.pub \
+        /etc/initramfs-tools/root/.ssh/id_rsa
+        # NOTE: clefs générées par Debian
+       sudo update-initramfs -u
+ }
+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_configure () {
+       grep -q '^hvc0$' /etc/securetty ||
        mk_reg mod= own= --append /etc/securetty <<-EOF
                hvc0
                EOF
-       grep -q xvc0 /etc/securetty ||
+       grep -q '^xvc0$' /etc/securetty ||
        mk_reg mod= own= --append /etc/securetty <<-EOF
                xvc0
                EOF
@@ -212,127 +300,31 @@ rule__login_init () {
                session optional pam_umask.so
                EOF
  }
-rule__user_root_init () {
-       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
-       mk_lnk etc/gpg /root/.gnupg
-       mk_lnk etc/ssh /root/.ssh
-       getent group sudo |
-       while IFS=: read -r group x x users
-        do while IFS=, read -r user
-                do eval local home\; home="~$user"
-                       cat "$home"/etc/ssh/authorized_keys
-                done <<-EOF
-                       $users
-                       EOF
-        done |
-       mk_reg mod=640 own=root:root /root/etc/ssh/authorized_keys
-       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
-               MODULES=most
-               BUSYBOX=y
-               KEYMAP=y
-               COMPRESS=gzip
-               DEVICE=eth0
-               EOF
-       mk_reg mod=644 own=root:root /etc/modprobe.d/xen-pv.conf <<-EOF
-               alias eth0 xennet
-               alias scsi_hostadapter xenblk
-               EOF
-       mk_reg mod=644 own=root:root /etc/modules <<-EOF
-               sha1_generic
-               sha256_generic
-               sha512_generic
-               aes-x86_64
-               xts
-               # NOTE: pour Xen en mode HVM :
-               #modprobe xen-platform-pci
-               EOF
-       mk_reg mod=644 own=root:root /etc/initramfs-tools/modules <<-EOF
+rule_network_configure () {
+       mk_reg mod= own= /etc/hostname <<-EOF
+               $vm
                EOF
-       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 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
-       mk_dir mod=640 own=root:root \
-        /etc/initramfs-tools/root \
-        /etc/initramfs-tools/root/.ssh
-       getent group sudo |
-       while IFS=: read -r group x x users
-        do while IFS=, read -r user
-                do eval local home\; home="~$user"
-                       cat "$home"/etc/ssh/authorized_keys
-                done <<-EOF
-                       $users
-                       EOF
-        done |
-       mk_reg mod=644 own=root:root /etc/initramfs-tools/root/.ssh/authorized_keys
-       sudo rm -f \
-        /etc/initramfs-tools/root/.ssh/id_rsa.dropbear \
-        /etc/initramfs-tools/root/.ssh/id_rsa.pub \
-        /etc/initramfs-tools/root/.ssh/id_rsa
-        # NOTE: clefs générées par Debian
-       sudo update-initramfs -u
- }
-rule__boot_init () {
-       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
-       mk_reg mod=644 own=root:root /etc/default/grub <<-EOF
-               GRUB_DEFAULT=0
-               GRUB_TIMEOUT=5
-               GRUB_DISTRIBUTOR=\`lsb_release -i -s 2> /dev/null || echo Debian\`
-               GRUB_CMDLINE_LINUX_DEFAULT="quiet"
-               GRUB_CMDLINE_LINUX="vt.default_utf8=1 rootfstype=ext4 loglevel=5 console=hvc0 ip=$vm_ipv4::$vm_ipv4:255.255.255.254:$vm:eth0:off resume=/dev/mapper/${vm}_swap_deciphered"
-               GRUB_DISABLE_RECOVERY="true"
-               #GRUB_PRELOAD_MODULES="lvm"
+       grep -q " $vm\$" /etc/hosts ||
+       mk_reg mod= own= --append /etc/hosts <<-EOF
+               127.0.0.1 $vm_fqdn $vm
                EOF
-       mk_reg mod=644 own=root:root /boot/grub/device.map <<-EOF
-               (hd0)   /dev/xvda
-               (hd0)   /dev/mapper/domU-$(printf %s $vm_fqdn-disk | sed -e 's/-/--/g')
+       mk_reg mod= own= /etc/network/interfaces <<-EOF
+               auto lo
+               iface lo inet loopback
+               
+               auto eth0=grenode
+               iface grenode inet static
+                   address   $vm_ipv4
+                   gateway   $vm_ipv4 # NOTE: proxy_arp sur la passerelle permet d'utiliser la même adresse
+                   network   $vm_ipv4
+                   broadcast $vm_ipv4
+                   netmask   255.255.255.255
+                   #mtu 1300
+                   post-up   ip address add    $vm_ipv4/32 dev \$IFACE
+                   pre-down  ip address delete $vm_ipv4/32 dev \$IFACE
                EOF
-       sudo update-grub2 # NOTE: prend en compte /boot/grub/device.map
-       rule__initramfs_init
  }
-rule__bin_init () {
-       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_disk_key_change () {
-       sudo cryptsetup luksChangeKey /dev/$vm_lvm_vg/${vm_lvm_lv}_root
- }
-
-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
@@ -417,6 +409,46 @@ rule_user_init () {
                  'case \$(/usr/bin/passwd --status "\$SUDO_USER") in ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac'
                EOF
  }
+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
+       mk_lnk etc/gpg /root/.gnupg
+       mk_lnk etc/ssh /root/.ssh
+       getent group sudo |
+       while IFS=: read -r group x x users
+        do while test -n "$users" && IFS=, read -r user users <<-EOF
+                       $users
+                       EOF
+                do eval local home\; home="~$user"
+                       cat "$home"/etc/ssh/authorized_keys
+                done
+        done |
+       mk_reg mod=640 own=root:root /root/etc/ssh/authorized_keys
+       local key
+       for key in "$tool"/var/pub/openpgp/*.key
+        do sudo gpg --import "$key"
+        done
+ }
+rule_bin_configure () {
+       mk_lnk "$tool"/vm_hosted /usr/local/sbin/
+ }
+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_add () { # SYNTAX: $user
        local user=$1
        id "$user" >/dev/null ||
@@ -426,10 +458,12 @@ 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
-       sudo gpg --import "$tool"/var/pub/opengpg/"$user".key
-           # TODO: importer toutes les clefs des utilisateurices
+       rule initramfs_configure
+       rule user_root_configure
+       local key; local -; set +f
+       for key in "$tool"/var/pub/openpgp/*.key
+        do sudo -u "$user" gpg --import "$key"
+        done
  }
 rule_user_mail_format () {
        mk_dir mod=770 own=root:adm /etc/skel/etc/procmail
@@ -792,7 +826,7 @@ rule_user_mail_format () {
        mk_reg mod=664 own=root:root /etc/postgrey/whitelist_recipients.local <<-EOF
                EOF
  }
-rule_mail_install () {
+rule_mail_configure () {
        sudo apt-get install postfix postgrey dovecot
  }
 
@@ -801,8 +835,7 @@ ${1+shift}
 case $rule in
  (help);;
  (*)
-       test "$(hostname --fqdn)" = "$vm_fqdn"
-       set "${TRACE:+-x}"
+       assert 'test "$(hostname --fqdn)" = "$vm_fqdn"' vm_fqdn
        ;;
  esac
-rule_$rule "$@"
+rule $rule "$@"