steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.18,1.19

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Conf.pm 
Log Message:
smptd policy server honors "delegate" property, master/slave comm. is completely "SSL-ified" now

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Conf.pm	15 Jun 2004 00:01:07 -0000	1.18
+++ Conf.pm	17 Jun 2004 02:49:14 -0000	1.19
@@ -440,10 +440,9 @@
         exit(1);
     }
 
-    print join ',',@{$Kolab::config{'kolabhost'}};
     for my $h ( @{$Kolab::config{'kolabhost'}} ) {
       next if $h eq $Kolab::config{'fqhostname'};
-      print $repl "replica host=$h\n"
+      print $repl "replica uri=ldaps://$h:9999\n"
         ."  binddn=\"cn=replicator\"\n"
 	."  bindmethod=simple credentials=secret\n\n";
     }
@@ -488,6 +487,7 @@
         "$templatedir/legacy.conf.template" => "$prefix/etc/apache/legacy.conf",
         "$templatedir/php.ini.template" => "$prefix/etc/apache/php.ini",
         "$templatedir/proftpd.conf.template" => "$prefix/etc/proftpd/proftpd.conf",
+        "$templatedir/ldap.conf.template" => "$prefix/etc/openldap/ldap.conf",
         "$templatedir/slapd.conf.template" => "$prefix/etc/openldap/slapd.conf",
         "$templatedir/freebusy.conf.template" => "$prefix/etc/resmgr/freebusy.conf",
         "$templatedir/fbview.conf.template" => "$prefix/etc/resmgr/fbview.conf",
@@ -511,6 +511,7 @@
       "$prefix/etc/apache/php.ini"                           => 0640,
       "$prefix/etc/proftpd/proftpd.conf"                     => 0640,
       "$prefix/etc/openldap/slapd.conf"                      => 0640,
+      "$prefix/etc/openldap/ldap.conf"                       => 0644,
       "$prefix/etc/postfix/transport"                        => 0640,
       "$prefix/etc/imapd/cyrus.conf"                         => 0640,
       "$prefix/etc/imapd/imapd.group"                        => 0640);
@@ -531,6 +532,7 @@
       "$prefix/etc/apache/legacy.conf"                       => "kolab:kolab-n",
       "$prefix/etc/apache/php.ini"                           => "kolab:kolab-n",
       "$prefix/etc/proftpd/proftpd.conf"                     => "kolab:kolab-n",
+      "$prefix/etc/openldap/ldap.conf"                       => "kolab:kolab",
       "$prefix/etc/openldap/slapd.conf"                      => "kolab:kolab",
       "$prefix/etc/postfix/transport"                        => "root:kolab",
       "$prefix/etc/imapd/cyrus.conf"                         => "kolab:kolab",