Changeset 3137

Timestamp:

04/13/12 11:57:28 (14 months ago)

Author:

squidly

Message:

Templating dovecot+Postifx + Bugfix

Location:

alternc/trunk

Files:

• debian/alternc.dirs (modified) (1 diff)
• debian/alternc.postinst (modified) (1 diff)
• debian/alternc.preinst (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• etc/alternc/alternc-sudoers (added)
• etc/alternc/templates/dovecot/dovecot-dict-quota.conf (added)
• etc/alternc/templates/dovecot/dovecot-sql.conf (modified) (2 diffs)
• etc/alternc/templates/dovecot/dovecot.conf (modified) (19 diffs)
• etc/alternc/templates/postfix/myalias.cf (modified) (1 diff)
• etc/alternc/templates/postfix/myvirtual.cf (modified) (1 diff)
• install/mysql.sql (modified) (1 diff)

alternc/trunk/debian/alternc.dirs

@@ -9 +9 @@
 etc/postfix
 etc/squirrelmail
+/etc/sudoers.d
 usr/bin
 usr/lib/alternc

alternc/trunk/debian/alternc.postinst

@@ -225 +225 @@
     # Update l18n files
     /usr/share/alternc/install/dopo.sh
+                
+                #sudo stuff allowing alterncpanel to use quota
+                if [ -d /etc/sudoers.d ]; then
+                        cp /etc/alternc/alternc-sudoers /etc/sudoers.d/alternc-sudoers
+                        chmod 0440 /etc/sudoers.d/alternc-sudoers
+                else
+                        echo "running an older version of sudo"
+                        echo "copy content of /usr/share/doc/aegir-provision/examples/example.sudoers into /etc/sudoers for aegir to run properly"
+          fi
 
     # important: postinst gele sans ca

alternc/trunk/debian/alternc.preinst

@@ -6 +6 @@
 
 # Create AlternC Panel user for web server
-addgroup --system --gid 1999 alterncpanel
+if ! getent group alterncpanel ; then
+        addgroup --system --gid 1999 alterncpanel
+fi
+if ! getent passwd alterncpanel ; then
 adduser --system --home "/etc/alternc/.alterncpanel" \
   --disabled-password --uid 1999 --ingroup alterncpanel alterncpanel
-
+fi
 case "$1" in
   install)

alternc/trunk/debian/changelog

@@ +1 @@
+alternc (1.1+nmu2) stable; urgency=low
+
+  * Templating of dovecot and postfix
+        adding a view for dovecot usage (dovecot_view)
+        adding of user vmail dedicated to the mail system
+  * Bugfixes
+
+ -- root <root@debian-prime.in.nnx.com>  Sat, 03 Mar 2012 13:09:06 +0100
+
 alternc (1.1+nmu1) stable; urgency=low
 

alternc/trunk/debian/control

@@ -11 +11 @@
 Architecture: all
 Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, squirrelmail, squirrelmail-locales, bind9, wget, rsync, quota, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, fam | gamin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), adduser, mysql-client, dnsutils, bash, acl, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d
+Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, squirrelmail, squirrelmail-locales, bind9, wget, rsync, quota, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, fam | gamin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), sudo, adduser, mysql-client, dnsutils, bash, acl, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d
 Recommends: mysql-server, dovecot-managesieved, dovecot-sieve, dovecot-mysql
 Conflicts: alternc-admintools, alternc-awstats (< 1.0), alternc-webalizer (<= 0.9.4), alternc-mailman (< 2.0), courier-authdaemon

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 concat(concat(%%ALTERNC_LOC%%, '/'), 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 '%u' IN (address.address, replace(address.address, '@', '_'))
+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'
 
 # If you wish to avoid two SQL lookups (passdb + userdb), you can use
@@ -125 +123 @@
 # also have to return userdb fields in password_query prefixed with "userdb_"
 # string. For example:
-password_query = \
-  SELECT '%u' AS user, address.password, \
-    concat(concat(%%ALTERNC_LOC%%, '/'), mailbox.path) AS userdb_home, domaines.compte AS userdb_uid, domaines.compte AS userdb_gid \
-  FROM mailbox JOIN address ON address.id = mailbox.address_id JOIN domaines on domaines.id = address.domain_id WHERE '%u' IN (address.address, replace(address.address, '@', '_'))
+password_query = SELECT user, password, userdb_home, userdb_uid, userdb_gid,userdb_quota_rule FROM dovecot_view where user= '%u'; 
 

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

@@ -51 +51 @@
 # matches the local IP (ie. you're connecting from the same computer), the
 # connection is considered secure and plaintext authentication is allowed.
-disable_plaintext_auth = no
+disable_plaintext_auth = yes
 
 # Should all IMAP and POP3 processes be killed when Dovecot master process
@@ -93 +93 @@
 
 # SSL/TLS support: yes, no, required. </usr/share/doc/dovecot-common/wiki/SSL.txt>
-#ssl = yes
+ssl = required
 
 # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
 # dropping root privileges, so keep the key file unreadable by anyone but
 # root.
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-ssl_cert_file = /etc/alternc/apache.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem
-ssl_key_file = /etc/alternc/apache.pem
+ssl_cert_file = /etc/ssl/certs/dovecot.pem
+#ssl_cert_file = /etc/alternc/apache.pem
+ssl_key_file = /etc/ssl/private/dovecot.pem
+#ssl_key_file = /etc/alternc/apache.pem
 
 # If key file is password protected, give the password here. Alternatively
@@ -247 +247 @@
 # without a location setting. Default namespace is simply done by having a
 # namespace with empty prefix.
-namespace private {
+#namespace private {
    # Hierarchy separator to use. You should use the same separator for all
    # namespaces or some clients get confused. '/' is usually a good one.
    # The default however depends on the underlying mail storage format.
-   separator = . 
+   # separator = . 
 
    # Prefix required to access this namespace. This needs to be different for
    # all namespaces. For example "Public/".
-   prefix = INBOX.
+   # prefix = INBOX.
 
    # Physical location of the mailbox. This is in same format as
@@ -263 +263 @@
    # There can be only one INBOX, and this setting defines which namespace
    # has it.
-   inbox = yes
+   #inbox = yes
 
    # If namespace is hidden, it's not advertised to clients via NAMESPACE
@@ -280 +280 @@
    # namespace handles them (empty prefix should always have this as "yes")
    #subscriptions = yes
-}
+#}
 
 # Example shared namespace configuration
@@ -385 +385 @@
 # Note that denying root logins is hardcoded to dovecot binary and can't
 # be done even if first_valid_uid is set to 0.
-first_valid_uid = 33
-last_valid_uid = 33
+first_valid_uid = 2000
+last_valid_uid = 65000
 
 # Valid GID range for users, defaults to non-root/wheel. Users having
@@ -580 +580 @@
   # list of plugins to load.
   #mail_plugins = 
+  mail_plugins = quota imap_quota 
   #mail_plugin_dir = /usr/lib/dovecot/modules/imap
 
@@ -699 +700 @@
   # list of plugins to load.
   #mail_plugins = 
+  mail_plugins = quota 
   #mail_plugin_dir = /usr/lib/dovecot/modules/pop3
 
@@ -722 +724 @@
   # ManageSieve executable location. See IMAP's mail_executable above for
   # examples how this could be changed.
-  #mail_executable = /usr/lib/dovecot/managesieve
+  mail_executable = /usr/lib/dovecot/managesieve
 
   # Maximum ManageSieve command line length in bytes. This setting is
@@ -762 +764 @@
   # Support for dynamically loadable plugins. mail_plugins is a space separated
   # list of plugins to load.
-  mail_plugins = sieve
-  mail_plugin_dir = /usr/lib/dovecot/modules/lda
+  mail_plugins = quota sieve
+  #mail_plugin_dir = /usr/lib/dovecot/modules/lda
 
   # If user is over quota, return with temporary failure instead of
@@ -777 +779 @@
 
   # Binary to use for sending mails.
-  sendmail_path = /usr/sbin/sendmail
+  #sendmail_path = /usr/sbin/sendmail
 
   # Subject: header to use for rejection mails. You can use the same variables
@@ -796 +798 @@
 
 # Executable location
-auth_executable = /usr/lib/dovecot/dovecot-auth
+#auth_executable = /usr/lib/dovecot/dovecot-auth
 
 # Set max. process size in megabytes.
@@ -893 +895 @@
   #   gss-spnego
   # NOTE: See also disable_plaintext_auth setting.
-  mechanisms = plain
+  mechanisms = plain login
 
   #
@@ -1033 +1035 @@
   # configuration files for more information how to do it.
   # </usr/share/doc/dovecot-common/wiki/UserDatabase.Prefetch.txt>
-  #userdb prefetch {
-  #}
+  userdb prefetch {
+  }
 
   # System users (NSS, /etc/passwd, or similiar). In many systems nowadays this
@@ -1101 +1103 @@
   # requires roots. Note that this user is NOT used to access mails.
   # That user is specified by userdb above.
-  user = mail
+  user = vmail
 
   # Directory where to chroot the process. Most authentication backends don't
@@ -1128 +1130 @@
       mode = 0666
       # Default user/group is the one who started dovecot-auth (root)
-      #user = 
+      user = vmail 
       #group = 
     }
@@ -1167 +1169 @@
 
 dict {
-  #quota = mysql:/etc/dovecot/dovecot-dict-quota.conf
+  quota = mysql:/etc/dovecot/dovecot-dict-quota.conf
   #expire = db:/var/lib/dovecot/expire.db
 }
@@ -1193 +1195 @@
   # userdb. It's also possible to give mailbox-specific limits, for example:
   #   quota_rule = *:storage=1048576
+     quota_rule = *:storage=100M
   #   quota_rule2 = Trash:storage=102400
   # User has now 1GB quota, but when saving to Trash mailbox the user gets
@@ -1210 +1213 @@
   # Note that % needs to be escaped as %%, otherwise "% " expands to empty.
   #   quota_warning = storage=95%% /usr/local/bin/quota-warning.sh 95
+  #   quota_warning = storage=95%% /usr/local/bin/quota-warning.sh 95
   #   quota_warning2 = storage=80%% /usr/local/bin/quota-warning.sh 80
+     quota_warning = storage=80%% /usr/local/bin/quota-warning.sh 80
   #quota = maildir
+  quota = dict:user:proxy::quotadict
 
   # ACL plugin. vfile backend reads ACLs from "dovecot-acl" file from maildir

alternc/trunk/etc/alternc/templates/postfix/myalias.cf

@@ -7 +7 @@
 hosts =%%dbhost%%
 dbname = %%dbname%%
-query = select concat(if(isnull(mailbox.id), '', concat(address.address, '\n')), recipient.recipient) from recipient join address on address.id = recipient.address_id left outer join mailbox on mailbox.address_id = address.id where address.address='%s';
+query = select concat( if(isnull(mailbox.id), '', concat(concat(address.address,'@',domaines.domaine), '\n')), recipient.recipients ) from recipient join address on address.id = re
+cipient.address_id left outer join mailbox on mailbox.address_id = address.id join domaines on domaines.id = address.domain_id where concat(address.address,'@',domaines.domaine)='%
+s';
+ 
 

alternc/trunk/etc/alternc/templates/postfix/myvirtual.cf

@@ -7 +7 @@
 hosts =%%dbhost%%
 dbname = %%dbname%%
-select concat(path, '/Maildir/') from mailbox join address on address.id = mailbox.address_id where address.address='%s'
+query = select concat(path, '/Maildir/') from mailbox join address on address.id = mailbox.address_id join domaines on domaines.id = address.domain_id where concat(address.address,
+'@',domaines.domaine) ='%s';
 

alternc/trunk/install/mysql.sql

@@ -639 +639 @@
   KEY `uid` (`uid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1;
+
+
+
+--
+-- Structure de la vue `dovecot-view`
+--
+
+CREATE VIEW `dovecot_view` AS
+SELECT concat(`address`.`address`,'@',`domaines`.`domaine`) AS `user`,
+concat('*:storage=',cast(`mailbox`.`quota` as char charset latin1),'M') AS `userdb_quota_rule`,
+`address`.`password` AS `password`,
+`mailbox`.`path` AS `userdb_home`,
+`domaines`.`compte` AS `userdb_uid`,
+`domaines`.`compte` AS `userdb_gid`,
+`mailbox`.`bytes` AS `quota_dovecot`,
+`mailbox`.`messages` AS `nb_messages` 
+from ((`mailbox`
+join `address` on((`address`.`id` = `mailbox`.`address_id`))) 
+join `domaines` on((`domaines`.`id` = `address`.`domain_id`)));
+