richard: server/perl-kolab/Kolab-Conf Conf.pm.in,1.5,1.6

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv29341/Kolab-Conf

Modified Files:
	Conf.pm.in 
Log Message:
Finish the partial commit done on 20 Mar 2006 21:09:07
The impact is minimal as only the comments have changed.



Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Conf.pm.in	22 Feb 2006 21:28:42 -0000	1.5
+++ Conf.pm.in	27 Mar 2006 21:07:54 -0000	1.6
@@ -81,7 +81,7 @@
 # 		 "$templatedir/session_vars.php.template" => "@phplibdir2@/admin/include/session_vars.php",
 # 		 "$templatedir/clamd.conf.template" => "@clamav_confdir@/clamd.conf",
 # 		 "$templatedir/freshclam.conf.template" => "@clamav_confdir@/freshclam.conf",
-# 		 "$templatedir/amavisd.conf.template" => "@amavisd_confdir@/amavisd.conf",
+# 		 "$templatedir/amavisd.conf.template" => "@amavisd_conffile@",
 # 		 "$templatedir/main.cf.template" => "@emailserver_confdir@/main.cf@",
 # 		 "$templatedir/ldapdistlist.cf.template" => "@emailserver_confdir@/ldapdistlist.cf",
 # 		 "$templatedir/ldaptransport.cf.template" => "@emailserver_confdir@/ldaptransport.cf",
@@ -95,7 +95,7 @@
 # 		 "$templatedir/cyrus.conf.template" => "@imap_confdir@/cyrus.conf",
 # 		 "$templatedir/httpd.conf.template" => "@webserver_confdir@/apache.conf",
 # 		 "$templatedir/httpd.local.template" => "@webserver_confdir@/apache.local",
-# 		 "$templatedir/php.ini.template" => "@webserver_confdir@/php.ini",
+# 		 "$templatedir/php.ini.template" => "@phpini_dir@/php.ini",
 # 		 "$templatedir/proftpd.conf.template" => "@ftpserver_confdir@/proftpd.conf",
 # 		 "$templatedir/ldap.conf.template" => "@sysconfdir@/openldap/ldap.conf",
 # 		 "$templatedir/slapd.conf.template" => "@sysconfdir@/openldap/slapd.conf",
@@ -125,7 +125,7 @@
 # 		   "@imap_confdir@/imapd.conf"                             => oct('@imap_confperm@'),
 # 		   "@webserver_confdir@/apache.conf"                       => 0640,
 # 		   "@webserver_confdir@/apache.local"                      => 0640,
-# 		   "@webserver_confdir@/php.ini"                           => 0640,
+# 		   "@phpini_dir@/php.ini"  		                          => 0640,
 # 		   "@ftpserver_confdir@/proftpd.conf"                      => 0640,
 # 		   "@sysconfdir@/openldap/slapd.conf"                      => 0640,
 # 		   "@sysconfdir@/openldap/slapd.access"                    => 0640,
@@ -150,12 +150,12 @@
 # 		 "@emailserver_confdir@/master.cf"                        => "@emailserver_usr@:@emailserver_grp@",
 # 		 "@clamav_confdir@/clamd.conf"                           => "kolab:kolab-r",
 # 		 "@clamav_confdir@/freshclam.conf"                       => "kolab:kolab-r",
-# 		 "@amavisd_confdir@/amavisd.conf"                        => "kolab:kolab-r",
+# 		 "@amavisd_conffile@"                                    => "kolab:kolab-r",
 # 		 "@sasl_authdconffile@"                                  => "kolab:kolab",
 # 		 "@imap_confdir@/imapd.conf"                             => "@imap_usr@:@imap_grp@",
 # 		 "@webserver_confdir@/apache.conf"                       => "kolab:kolab-n",
 # 		 "@webserver_confdir@/apache.local"                      => "kolab:kolab-n",
-# 		 "@webserver_confdir@/php.ini"                           => "kolab:kolab-n",
+# 		 "@phpini_dir/php.ini"                        			   => "kolab:kolab-n",
 # 		 "@ftpserver_confdir@/proftpd.conf"                      => "kolab:kolab-n",
 # 		 "@sysconfdir@/openldap/ldap.conf"                       => "@ldapserver_usr@:@ldapserver_grp@",
 # 		 "@sysconfdir@/openldap/slapd.conf"                      => "@ldapserver_usr@:@ldapserver_grp@",