Changeset 3146 for alternc/trunk

Timestamp:

05/04/12 10:57:23 (13 months ago)

Author:

squidly

Message:

Correction template dovecot + configuration d'installation

Location:

alternc/trunk

Files:

• etc/alternc/postfix.cf (modified) (4 diffs)
• etc/alternc/templates/dovecot/dovecot-sql.conf (modified) (2 diffs)
• install/alternc.install (modified) (1 diff)
• tools/postfix-add-policy (modified) (2 diffs)

alternc/trunk/etc/alternc/postfix.cf

@@ +1 @@
+# Postfix Configuration options
 # Used by alternc.install with postconf
 home_mailbox = Maildir/
@@ -6 +7 @@
 local_destination_concurrency_limit = 8
 default_destination_concurrency_limit = 10
+# TLS options
 smtpd_use_tls = yes
 smtpd_tls_dcert_file = /etc/alternc/apache.pem
@@ -15 +17 @@
 smtpd_tls_received_header = yes
 smtpd_tls_session_cache_timeout = 3600s
-smtp_use_tls = yes
 smtp_tls_dcert_file = $smtpd_tls_dcert_file
 smtp_tls_dkey_file = $smtpd_tls_dcert_file
 smtp_tls_CApath = $smtpd_tls_CApath
 smtpd_tls_auth_only = yes
+#SASL options
 smtpd_sasl_auth_enable = yes
 smtpd_sasl_local_domain = postfix
@@ -25 +27 @@
 enable_sasl_authentification = yes
 broken_sasl_auth_clients = yes
+smtpd_sasl_type=dovecot
+smtpd_sasl_path=private/auth
+smtpd_sasl_auth_enable=yes
+#Virtual Maping
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases

alternc/trunk/etc/alternc/templates/dovecot/dovecot-sql.conf

@@ -117 +117 @@
 #   user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u'
 #
-user_query = SELECT mailbox.path AS home, domaines.compte AS uid, domaines.compte AS gid FROM mailbox JOIN address ON address.id = mailbox.address_id JOIN domaines on domaines.id = address.domain_id WHERE address.address = '%n'
+user_query = SELECT mailbox.path AS home, domaines.compte AS uid, 1998 AS gid FROM mailbox JOIN address ON address.id = mailbox.address_id JOIN domaines on domaines.id = address.domain_id WHERE address.address = '%n'
 
 # If you wish to avoid two SQL lookups (passdb + userdb), you can use
@@ -123 +123 @@
 # also have to return userdb fields in password_query prefixed with "userdb_"
 # string. For example:
-password_query = SELECT user, password, userdb_home, userdb_uid, userdb_gid,userdb_quota_rule FROM dovecot_view where user= '%u'; 
+password_query = SELECT user, password, userdb_home, userdb_uid, 1998 AS userdb_gid,userdb_quota_rule FROM dovecot_view where user= '%u'; 
 

alternc/trunk/install/alternc.install

@@ -291 +291 @@
     postfix_conf=/etc/alternc/postfix.cf
 fi
-while read line ; do
+grep -v '^\ *#' $postfix_conf |while read line ; do
    postconf -e "$line"
-done < "$postfix_conf"
+done 
 
 # Conviguring delivery used bu Postfix FIXME change script name

alternc/trunk/tools/postfix-add-policy

@@ -53 +53 @@
 
 Adds the following to master.cf:
-""" + makepolicy('policyd','method','flags', 'nobody', '/usr/bin/policyd') + """
+""" + makepolicy('policyd','method','flags', 'user', '/usr/bin/policyd') + """
 To output this usage message:
     % postfix-add-policy
@@ -90 +90 @@
                 '/etc/postfix/master.cf.working')
             # Add stuff in
-            stuff = makepolicy(policyname, user, method, flags, argv)
+            stuff = makepolicy(policyname, method, flags, user, argv)
             # Append stuff to the working copy: