Ajout : rule_user_configure : bash, screen, etckeeper .

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index cbc6776..46ae2ce 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -22,11 +22,14 @@ rule_help () { # SYNTAX: [--hidden]
                EOF
  }
 
-rule_git_config () {
+rule_git_configure () {
        (
        cd "$tool"
        git config --replace branch.master.remote .
        git config --replace branch.master.merge refs/remotes/master
+       local tool
+       tool=$(cd "$tool"; cd -)
+       sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
        )
  }
 rule_git_reset () {
@@ -73,8 +76,7 @@ rule_apt_configure () {
        sudo install -m 660 -u root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF
                deb http://nightly.openerp.com/trunk/nightly/deb/ ./
                EOF
- }
-rule_apticron_configure () {
+       sudo apt-get update
        rule apt_get_install apticron
        sudo install -m 644 -u root -g root /dev/stdin /etc/apticron/apticron.conf <<-EOF
                EMAIL="admin@$vm_domainname"
@@ -204,6 +206,9 @@ rule_etckeeper_configure () {
                HIGHLEVEL_PACKAGE_MANAGER=apt
                LOWLEVEL_PACKAGE_MANAGER=dpkg
                EOF
+       sudo install -m 644 -o root -g root \
+         etc/etckeeper/prompt.sh \
+        /etc/etckeeper/prompt.sh
        rule apt_get_install etckeeper
  }
 rule_filesystem_configure () {
@@ -538,18 +543,7 @@ rule_network_configure () {
                    pre-down  ip address delete $vm_ipv4/32 dev \$IFACE
                EOF
  }
-rule_user_configure () {
-       sudo install -d -m 750 -u root -g adm \
-        /etc/skel/etc \
-        /etc/skel/etc/ssh
-       sudo install -d -m 770 -u root -g adm \
-        /etc/skel/etc/apache2 \
-        /etc/skel/var \
-        /etc/skel/var/log \
-        /etc/skel/var/cache \
-        /etc/skel/var/cache/ssh
-       sudo ln -fns etc/ssh /etc/skel/.ssh
-       sudo ln -fns etc/gpg /etc/skel/.gnupg
+rule_ssh_configure () {
        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
@@ -656,6 +650,12 @@ rule_user_configure () {
                sudo /bin/sh -e -f -u -c \
                  'case \$(/usr/bin/passwd --status "\$SUDO_USER") in ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac'
                EOF
+       sudo install -m 644 -u root -g root \
+         etc/bash.bashrc \
+        /etc/bash.bashrc
+       sudo install -m 644 -o root -g root \
+         etc/screenrc \
+        /etc/screenrc
  }
 rule_user_root_configure () {
        sudo install -d -m 750 -u root -g adm \
@@ -679,20 +679,18 @@ rule_user_root_configure () {
         do sudo gpg --import "$key"
         done
  }
-rule_bin_configure () {
-       sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
- }
 rule_configure () {
+       rule apt_configure
+       rule git_configure
        rule etckeeper_configure
        rule locale_configure
        rule network_configure
-       rule apt_configure
        rule filesystem_configure
        rule login_configure
+       rule ssh_configure
        rule user_root_configure
        rule boot_configure
-       rule apticron_configure
-       rule bin_configure
+       rule user_configure
  }
 
 rule_luks_key_change () {