X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=f6107016c3afb686403f486dca06122ff8718218;hb=a7d0fb2448e129747fce8e108ce80e4ce3c17845;hp=3f5c747e388df7fe78e27bc0e90cb810ca97feb4;hpb=abbc0fe09aabfd8f066f45ac62b218e6672f930c;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index 3f5c747..f610701 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -1,6 +1,10 @@
 #!/bin/sh
 set -e -f ${DRY_RUN:+-n} -u
-tool=${0%/*}
+tool=$0
+while test -L "$tool"
+ do tool=$(readlink "$tool")
+ done
+tool=${tool%/*}
 . "$tool"/lib/rule.sh
 . "$tool"/etc/vm.sh
 
@@ -30,6 +34,7 @@ rule_git_configure () {
 	local tool
 	tool=$(cd "$tool"; cd -)
 	sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
+	sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/vm
 	)
  }
 rule_git_reset () {
@@ -41,14 +46,7 @@ rule_git_reset () {
  }
 
 rule_apt_get_install () { # SYNTAX: $package
-	case $(dpkg -s "$1" 2>/dev/null | grep '^Status: ') in
-		("Status: install ok installed");;
-		(*)
-		test ! -x /usr/bin/etckeeper ||
-		! sudo etckeeper unclean ||
-		warn "/etc unclean: etckeeper may force you to \`etckeeper commit'; then you can run your $0 command again."
-		sudo apt-get install "$@";;
-	 esac
+	sudo apt-get install "$@"
  }
 
 rule__chrooted_configure () { # NOTE: est-ce bien utile à un moment ?
@@ -207,8 +205,8 @@ rule_etckeeper_configure () {
 		LOWLEVEL_PACKAGE_MANAGER=dpkg
 		EOF
 	sudo install -m 644 -o root -g root \
-	  etc/etckeeper/prompt.sh \
-	 /etc/etckeeper/prompt.sh
+	 "$tool"/etc/etckeeper/prompt.sh \
+	        /etc/etckeeper/prompt.sh
 	rule apt_get_install etckeeper
  }
 rule_filesystem_configure () {
@@ -417,6 +415,9 @@ rule_postfix_configure () {
 	assert "test -f /etc/postfix/$vm_domainname/smtpd/x509/key.pem" hint
 	warn "lors de l'installation Debian, ne sélectionner aucune configuration pour postfix"
 	rule apt_get_install postfix
+	sudo install -m 640 -o root -g root /dev/stdin /etc/postfix/.gitignore <<-EOF
+		*.db
+		EOF
 	sudo install -d -m 770 -o root -g root \
 	 /etc/postfix/$vm_domainname/ \
 	 /etc/postfix/$vm_domainname/smtp \
@@ -452,9 +453,9 @@ rule_postfix_configure () {
 	  etc/postfix/$vm_domainname/header_checks \
 	 /etc/postfix/$vm_domainname/header_checks
 	sudo install -m 664 -o root -g root \
-	  etc/aliases \
-	 /etc/aliases
-	sudo newaliases
+	  etc/postfix/aliases \
+	 /etc/postfix/aliases
+	sudo newaliases -oA/etc/postfix/aliases
 	cat /dev/stdin etc/postfix/main.cf <<-EOF |
 		mydomain      = $vm_domainname
 		myorigin      = \$mydomain