Clean de postfix-add-policy

.gitattributes

@@ -524,6 +524,7 @@ src/functions_dns.sh -text
 src/functions_hosting.sh -text
 src/mem_add -text
 src/mem_del -text
+src/postfix-add-policy -text
 src/quota-warning.sh -text
 src/quota_delete -text
 src/quota_edit -text
@@ -544,7 +545,6 @@ tests/whois_test.php -text
 tools/alternc_get_path -text
 tools/get_account_by_domain -text
 tools/get_domains_by_account -text
-tools/postfix-add-policy -text
 tools/top_ftp_users -text
 tools/top_http_users -text
 tools/top_mysql_users -text

debian/rules

@@ -84,7 +84,6 @@ install: build
 	install tools/get_domains_by_account debian/alternc/usr/bin
 	install tools/get_account_by_domain debian/alternc/usr/bin
 	install tools/alternc_get_path debian/alternc/usr/bin
-	install tools/postfix-add-policy debian/alternc/usr/bin
 	install src/alternc_reload debian/alternc/usr/bin
 	install -m 644 po/fr/LC_MESSAGES/alternc-admintools.mo debian/alternc/usr/share/locale/fr/LC_MESSAGES/
 

install/alternc.install

@@ -294,8 +294,8 @@ grep -v '^\ *#' $postfix_conf |while read line ; do
    postconf -e "$line"
 done 
 
-# Conviguring delivery used bu Postfix FIXME change script name
+# Conviguring delivery used bu Postfix
-echo `/usr/bin/postfix-add-policy dovecot vmail:vmail DRhu pipe '/usr/bin/sudo /usr/lib/dovecot/deliver -f ${sender} -d ${recipient} '`
+echo `/usr/lib/alternc/postfix-add-policy dovecot vmail:vmail DRhu pipe '/usr/bin/sudo /usr/lib/dovecot/deliver -f ${sender} -d ${recipient} '`
 
 # Bug #1215: configure mydestination when $FQDN is not in
 OLDDESTINATION=`postconf mydestination | awk -F '=' '{print $2}'`

src/Makefile

@@ -26,7 +26,7 @@
 # ----------------------------------------------------------------------
 #
 SETUID=quota_edit quota_get mem_add mem_del du.pl
-SCRIPTS=sqlbackup.sh rawstat.daily quota_init quota_delete update_domains.sh slave_dns sendmail spoolsize.php fixperms.sh alternc-dboptimize export_account.php cron_users_doit.sh cron_users.sh compress_logs.sh delete_logs.sh quota-warning.sh update_mails.sh
+SCRIPTS=sqlbackup.sh rawstat.daily quota_init quota_delete update_domains.sh slave_dns sendmail spoolsize.php fixperms.sh alternc-dboptimize export_account.php cron_users_doit.sh cron_users.sh compress_logs.sh delete_logs.sh quota-warning.sh update_mails.sh postfix-add-policy
 LIBS=functions.sh functions_hosting.sh functions_dns.sh
 BIN=$(DESTDIR)/usr/lib/alternc/
 

src/postfix-add-policy

@@ -3,7 +3,10 @@
 postfix-add-filter - A script to append new services to Postfix master.cf to
 simplify integration of content filters.
 
-Copyright (c) 2008 Scott Kitterman <scott@kitterman.com>
+Modified version for Alternc. Original author: Scott Kitterman <scott@kitterman.com>
+
+For the need of AlternC, we add the feature to specify policy name.
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -20,9 +23,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 '''
-__author__ = "Scott Kitterman"
+__author__ = "AlternC"
-__email__ = "scott@kitterman.com"
+__email__ = "equipe@alternc.org"
-__version__ = "0.1: August 3, 2008"
+__version__ = "0.1~alternc: August 26, 2012"
 
 import sys
 import shutil