Modification : rule_*_init -> rule_*_configure .

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index 8d2470f..a92477c 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -37,13 +37,13 @@ rule_git_reset () {
        )
  }
 
        )
  }
 

-rule__chrooted_init () { # NOTE: est-ce bien utile à un moment ?
+rule__chrooted_configure () { # NOTE: est-ce bien utile à un moment ?

        export LANG=C
        export LC_CTYPE=C
        . /etc/profile
  }
 
        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
        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
  }
                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"
        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
  }
                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
        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
                (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=""
        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
  }
                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
        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
  }
                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
        mk_reg mod=644 own=root:root /etc/initramfs-tools/initramfs.conf <<-EOF
                MODULES=most
                BUSYBOX=y


@@ -200,13 +200,13 @@ rule_initramfs_init () {
         # NOTE: clefs générées par Debian
        sudo update-initramfs -u
  }
         # 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
  }
        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
        grep -q '^hvc0$' /etc/securetty ||
        mk_reg mod= own= --append /etc/securetty <<-EOF
                hvc0


@@ -300,7 +300,7 @@ rule_login_init () {
                session optional pam_umask.so
                EOF
  }
                session optional pam_umask.so
                EOF
  }

-rule_network_init () {
+rule_network_configure () {

        mk_reg mod= own= /etc/hostname <<-EOF
                $vm
                EOF
        mk_reg mod= own= /etc/hostname <<-EOF
                $vm
                EOF


@@ -324,7 +324,7 @@ rule_network_init () {
                    pre-down  ip address delete $vm_ipv4/32 dev \$IFACE
                EOF
  }
                    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
        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 +409,7 @@ rule_user_init () {
                  'case \$(/usr/bin/passwd --status "\$SUDO_USER") in ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac'
                EOF
  }
                  '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
        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


@@ -430,19 +430,19 @@ rule_user_root_init () {
         do sudo gpg --import "$key"
         done
  }
         do sudo gpg --import "$key"
         done
  }

-rule_bin_init () {
+rule_bin_configure () {

        mk_lnk "$tool"/vm_hosted /usr/local/sbin/
  }
        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 () {
  }
 
 rule_disk_key_change () {


@@ -458,8 +458,8 @@ 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
        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
+       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"
        local key; local -; set +f
        for key in "$tool"/var/pub/openpgp/*.key
         do sudo -u "$user" gpg --import "$key"


@@ -826,7 +826,7 @@ rule_user_mail_format () {
        mk_reg mod=664 own=root:root /etc/postgrey/whitelist_recipients.local <<-EOF
                EOF
  }
        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
  }
 
        sudo apt-get install postfix postgrey dovecot
  }