Ajout : vm_hosted : rule_postgresql_configure .

[lhc/ateliers.git] / vm_host

diff --git a/vm_host b/vm_host
index ba6461d..4ad1c38 100755 (executable)
--- a/vm_host
+++ b/vm_host
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
 tool=${0%/*}
-. "$tool"/lib/functions.sh
+. "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 
 rule_help () { # SYNTAX: [--hidden]
@@ -45,7 +45,7 @@ rule_git_reset () {
  }
 
 rule_vm_configure () {
-       mk_reg mod=644 own=root:root /etc/xen/$vm_fqdn.cfg <<-EOF
+       sudo install -m 644 -u root -g root /dev/stdin /etc/xen/$vm_fqdn.cfg <<-EOF
                #  -*- mode: python; -*-
                # DOC: http://wiki.xen.org/wiki/Xen_Linux_PV_on_HVM_drivers
                import os, re
@@ -248,8 +248,8 @@ rule_part_root_format () {
        if ! mount | grep -q "^$vm_dev_disk_root "
         then
                sudo cryptsetup luksFormat --hash=sha512 --key-size=512 \
-                --cipher=aes-xts-essiv:sha256 --key-file=- --align-payload=8 $vm_dev_disk_root
-               sudo cryptsetup luksOpen --key-file=- $vm_dev_disk_root ${vm_lvm_lv}_root_deciphered
+                --cipher=aes-xts-essiv:sha256 --align-payload=8 $vm_dev_disk_root
+               sudo cryptsetup luksOpen $vm_dev_disk_root ${vm_lvm_lv}_root_deciphered
                sudo mke2fs -t ext4 -c -c -m 5 -T ext4 -b $vm_e2fs_block_size \
                 -E resize=30G${vm_e2fs_extended_options} \
                 -L ${vm_lvm_lv}_root \
@@ -281,9 +281,6 @@ rule_part_root_umount () {
        ! test -e     /dev/mapper/${vm_lvm_lv}_root_deciphered ||
        sudo cryptsetup luksClose ${vm_lvm_lv}_root_deciphered
  }
-rule_part_root_backup_luks () {
-       sudo cryptsetup luksHeaderBackup $vm_dev_disk_root --header-backup-file ./root.luks
- }
 rule_part_swap_format () {
        rule _part_encrypted_format swap
        rule _part_encrypted_mount  swap