steffen: server/kolab/kolab kolab.schema, 1.6, 1.7 kolab_bootstrap, 1.15, 1.16 main.cf.template, 1.8, 1.9

cvs at intevation.de cvs at intevation.de
Fri Apr 16 13:58:37 CEST 2004


Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv23739/kolab/kolab

Modified Files:
	kolab.schema kolab_bootstrap main.cf.template 
Log Message:
new @@@if blah@@@ syntax for templates, new attribute postfix-enable-virus-scan in schema and main.cf.template

Index: kolab.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab.schema,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab.schema	31 Mar 2004 13:23:12 -0000	1.6
+++ kolab.schema	16 Apr 2004 11:58:35 -0000	1.7
@@ -610,6 +610,10 @@
         NAME 'postfix-transport'
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
+attributetype ( 1.3.6.1.4.1.19414.2.1.507
+        NAME 'postfix-enable-virus-scan'
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
 
 # imapd specific attributes
 
@@ -690,6 +694,7 @@
 		postfix-mynetworks $ 
  		postfix-relayhost $ 
 		postfix-transport $
+		postfix-enable-virus-scan $
 	      	cyrus-autocreatequota $ 
 		cyrus-admins $ 
 		cyrus-imap $ 

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- kolab_bootstrap	31 Mar 2004 13:23:12 -0000	1.15
+++ kolab_bootstrap	16 Apr 2004 11:58:35 -0000	1.16
@@ -207,6 +207,7 @@
         'postfix-mynetworks' => $mynetworkinterfaces,
         #'postfix-relayhost' => "",
         #'postfix-transport' => "",
+	'postfix-enable-virus-scan' => "",
         'cyrus-autocreatequota' => 100000,
         'cyrus-admins' => "manager",
         'cyrus-imap' => "TRUE",

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/main.cf.template,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- main.cf.template	31 Mar 2004 13:23:12 -0000	1.8
+++ main.cf.template	16 Apr 2004 11:58:35 -0000	1.9
@@ -120,9 +120,10 @@
 ldapsource_bind = no
 ldapsource_version = 3
 
+@@@if postfix-enable-virus-scan@@@
 #
 # Amavis virus scan
 #
 
 content_filter=smtp-amavis:[127.0.0.1]:10024
-
+@@@endif@@@





More information about the commits mailing list