X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fsv%2Fpostfix%2Fconfigure.sh;h=803798d4a0928d07f414e472670a29d782eeab29;hb=b27661cf8e40872543f86a00922d18573ef83612;hp=e17af103f07985464b54740d40a92bc8d7d833c2;hpb=7c02698fa11a13fd332c2e95986339241aaa79a6;p=lhc%2Fateliers.git

diff --git a/etc/sv/postfix/configure.sh b/etc/sv/postfix/configure.sh
index e17af10..803798d 100644
--- a/etc/sv/postfix/configure.sh
+++ b/etc/sv/postfix/configure.sh
@@ -4,7 +4,7 @@ assert "test -f /etc/postfix/$vm_domainname/smtpd/x509/key.pem" hint
 sudo debconf-set-selections <<-EOF
 	postfix	postfix/main_mailer_type	select	No configuration
 	EOF
-rule apt_get_install postfix procmail
+#rule apt_get_install postfix procmail
 rule insserv_remove  postfix
 sudo install -m 640 -o root -g root /dev/stdin /etc/postfix/.gitignore <<-EOF
 	*.db
@@ -36,17 +36,13 @@ sudo install -m 400 -o root -g root \
 sudo install -m 640 -o root -g root \
  "$tool"/etc/postfix/$vm_domainname/header_checks \
         /etc/postfix/$vm_domainname/header_checks
+m4 <"$tool"/etc/postfix/aliases.m4 |
 sudo install -m 644 -o root -g root /dev/stdin \
- /etc/postfix/aliases <<-EOF
-	# See man 5 aliases for format
-	abuse: root
-	admin: root
-	contact: root
-	mailer-daemon: root
-	postmaster: root
-	root: $(getent group sudo | cut -f 4 -d : | tr , ' ')
-	EOF
+ /etc/postfix/aliases
 sudo newaliases -oA/etc/postfix/aliases
+sudo ln -fns \
+ /etc/postfix/aliases \
+ /etc/aliases
 cat /dev/stdin "$tool"/etc/postfix/main.cf <<-EOF |
 	mydomain      = $vm_domainname
 	myorigin      = \$mydomain
@@ -54,7 +50,7 @@ cat /dev/stdin "$tool"/etc/postfix/main.cf <<-EOF |
 	mail_name     = \$myhostname
 	mydestination = $vm_hostname \$myhostname \$myorigin
 	EOF
-sudo install -m 640 -o root -g root /dev/stdin \
+sudo install -m 644 -o root -g root /dev/stdin \
  /etc/postfix/main.cf
 sudo install -m 640 -o root -g root \
  "$tool"/etc/postfix/master.cf \