From: Julien Moutinho <julm+burette@autogeree.net>
Date: Sun, 24 Feb 2013 16:45:16 +0000 (+0100)
Subject: Modification : etc/aliases -> etc/postfix/aliases .
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=baf37d50cd82e0140ceacb94376d70bc04d4e4ad

Modification : etc/aliases -> etc/postfix/aliases .
---

diff --git a/etc/aliases b/etc/aliases
deleted file mode 100644
index 5aa17d0..0000000
--- a/etc/aliases
+++ /dev/null
@@ -1,6 +0,0 @@
-# See man 5 aliases for format
-abuse: root
-admin: root
-contact: root
-postmaster: root
-root: julm lchevalier
diff --git a/etc/postfix/aliases b/etc/postfix/aliases
new file mode 100644
index 0000000..5aa17d0
--- /dev/null
+++ b/etc/postfix/aliases
@@ -0,0 +1,6 @@
+# See man 5 aliases for format
+abuse: root
+admin: root
+contact: root
+postmaster: root
+root: julm lchevalier
diff --git a/etc/postfix/main.cf b/etc/postfix/main.cf
index 3dac1ee..13da223 100644
--- a/etc/postfix/main.cf
+++ b/etc/postfix/main.cf
@@ -1,10 +1,7 @@
 # DOC: http://postfix.traduc.org/index.php/TLS_README.html
 
-alias_database = hash:/etc/aliases
-	# NOTE: fichier de hash contenant une table d’alias mail.
-	#       Celle-ci est éditable dans /etc/aliases, puis (indispensable)
-	#       regénérée en hash grâce à la commande newaliases qui produit /etc/aliases.db
-alias_maps = hash:/etc/aliases
+alias_database = hash:/etc/postfix/aliases
+alias_maps = hash:/etc/postfix/aliases
 append_dot_mydomain = no
 	# NOTE: appending .domain is the MUA's job.
 biff = no
diff --git a/vm_hosted b/vm_hosted
index b2423ca..d0dec72 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -460,9 +460,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