steffen: server/kolab/kolab kolab.schema, 1.11, 1.12 kolab_bootstrap, 1.31, 1.32
cvs at intevation.de
cvs at intevation.de
Fri Jun 11 10:55:07 CEST 2004
- Previous message: steffen: server/kolab kolab.spec,1.42,1.43
- Next message: steffen: server/kolab/kolab/templates fbview.conf.template, NONE, 1.1 freebusy.conf.template, NONE, 1.1 imapd.replicas.template, NONE, 1.1 resmgr.conf.template, NONE, 1.1 httpd.conf.template, 1.1, 1.2 imapd.conf.template, 1.1, 1.2 main.cf.template, 1.1, 1.2 php.ini.template, 1.1, 1.2 session_vars.php.template, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steffen
Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv9640/kolab
Modified Files:
kolab.schema kolab_bootstrap
Log Message:
prepare for integration with group/resource/fbview/freebusy modules
Index: kolab.schema
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab.schema,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolab.schema 24 May 2004 13:00:24 -0000 1.11
+++ kolab.schema 11 Jun 2004 08:55:05 -0000 1.12
@@ -584,6 +584,11 @@
NAME 'fqhostname'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+attributetype ( 1.3.6.1.4.1.19414.2.1.6
+ NAME 'kolabhost'
+ DESC 'Multivalued -- list of hostnames in a Kolab setup'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
# postfix specific attributes
attributetype ( 1.3.6.1.4.1.19414.2.1.501
@@ -707,7 +712,8 @@
DESC 'Kolab server config'
MUST k
SUP top STRUCTURAL
- MAY ( postfix-mydomain $
+ MAY ( kolabhost $
+ postfix-mydomain $
postfix-relaydomains $
postfix-mydestination $
postfix-mynetworks $
@@ -931,5 +937,7 @@
MAY (
homeServer $
unrestrictedMailSize $
- delegate)
+ delegate $
+ userClass
+ )
)
Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- kolab_bootstrap 7 Jun 2004 10:33:03 -0000 1.31
+++ kolab_bootstrap 11 Jun 2004 08:55:05 -0000 1.32
@@ -81,6 +81,7 @@
my $base_dn = $kolab_config{'base_dn'} || die "could not read base_dn from $kolab_config";
my $php_dn = $kolab_config{'php_dn'} || die "could not read php_dn from $kolab_config";
my $php_pw = $kolab_config{'php_pw'} || die "could not read php_pw from $kolab_config";
+my @kolabhosts;
if (!$bind_dn || !$bind_pw || !$ldap_uri || !$base_dn) {
print "Please check $kolab_config (seems to be incomplete)\n";
@@ -165,6 +166,7 @@
chomp $php_pw;
}
+
$fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
print $fd "fqhostname : $fqdn\n";
print $fd "is_master : $is_master\n";
@@ -181,6 +183,22 @@
print "use login=manager and passwd=$bind_pw when you log into the webinterface!\n\n";
}
+ # Set up slapd to replicate to slave server's kolabds
+ @kolabhosts = ( $fqdn );
+ while(1) {
+ print "Enter hostname of slave kolab server [empty when done]: ";
+ my $tmp = ReadLine;
+ chomp $tmp;
+ if( $tmp ) {
+ push @kolabhosts, $tmp;
+ #$cfg .= "replica host=$tmp\n";
+ #$cfg .= " binddn=\"cn=replicator\"\n";
+ #$cfg .= " bindmethod=simple credentials=secret\n\n";
+ } else {
+ last;
+ }
+ };
+
# remove all application specific fsl config files as these are yet to be done
# having invalid files there hinders applications from starting up properly
# we delay this until there's a better understanding of the fsl stuff
@@ -211,38 +229,8 @@
tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
."Please stop any running kolabd and bootstrap again\n";
- # Set up slapd to replicate to slave server's kolabds
- my $tmpl = IO::File->new("$kolab_prefix/etc/kolab/templates/slapd.conf.template", "r") || die "could not read $kolab_prefix/etc/kolab/templates/slapd.conf.template";
- my $cfg = "";
- while( <$tmpl> ) {
- my $line = $_;
- last if $line =~ /##### Replication setup (dont delete this line, kolab_bootstrap depends on it) #####/;
- $cfg .= $line;
- }
- close($tmpl);
- undef $tmpl;
-
- while(1) {
- print "name or IP of slave kolab server (host:port) [empty for none]: ";
- my $tmp = ReadLine;
- chomp $tmp;
- if( $tmp ) {
- $cfg .= "replica host=$tmp\n";
- $cfg .= " binddn=\"cn=replicator\"\n";
- $cfg .= " bindmethod=simple credentials=secret\n\n";
- } else {
- last;
- }
- };
-
- $tmpl = IO::File->new("$kolab_prefix/etc/kolab/templates/slapd.conf.template", "w") || die "could not write $kolab_prefix/etc/kolab/templates/slapd.conf.template";
- print $tmpl $cfg;
- close( $tmpl );
- undef $cfg;
- undef $tmpl;
-
# Creating slapd.conf from template
- $tmpl = IO::File->new("$kolab_prefix/etc/kolab/templates/slapd.conf.template", "r") || die "could not read $kolab_prefix/etc/kolab/templates/slapd.conf.template";
+ my $tmpl = IO::File->new("$kolab_prefix/etc/kolab/templates/slapd.conf.template", "r") || die "could not read $kolab_prefix/etc/kolab/templates/slapd.conf.template";
my $slpd = IO::File->new("$kolab_prefix/etc/openldap/slapd.conf","w+") || die "could not write to $kolab_prefix/etc/openldap/slapd.conf";
chmod (0640,"$kolab_prefix/etc/openldap/slapd.conf");
foreach (<$tmpl>) {
@@ -298,6 +286,7 @@
$ldapobject->replace(
'k' => 'kolab',
+ 'kolabhost' => \@kolabhosts,
'postfix-mydomain' => $domain,
#'postfix-relaydomains' => "",
'postfix-mydestination' => "\$mydomain",
- Previous message: steffen: server/kolab kolab.spec,1.42,1.43
- Next message: steffen: server/kolab/kolab/templates fbview.conf.template, NONE, 1.1 freebusy.conf.template, NONE, 1.1 imapd.replicas.template, NONE, 1.1 resmgr.conf.template, NONE, 1.1 httpd.conf.template, 1.1, 1.2 imapd.conf.template, 1.1, 1.2 main.cf.template, 1.1, 1.2 php.ini.template, 1.1, 1.2 session_vars.php.template, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list