gunnar: server/perl-kolab/bin kolab_bootstrap.in,1.1,1.2
cvs at kolab.org
cvs at kolab.org
Fri Nov 7 20:40:52 CET 2008
Author: gunnar
Update of /kolabrepository/server/perl-kolab/bin
In directory doto:/tmp/cvs-serv26263/bin
Modified Files:
kolab_bootstrap.in
Log Message:
Remove stray quote and fix unconverted config variable.
Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/bin/kolab_bootstrap.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab_bootstrap.in 10 Oct 2008 14:22:04 -0000 1.1
+++ kolab_bootstrap.in 7 Nov 2008 19:40:50 -0000 1.2
@@ -32,7 +32,7 @@
# Reload only kolab.globals into our configuration.
Kolab::reloadConfig("@CONFIG_DIR@/kolab.globals", 1);
-my $kolab_config = ""@CONFIG_DIR@/kolab.conf";
+my $kolab_config = "@CONFIG_DIR@/kolab.conf";
my %kolab_config;
##### Utility Functions
@@ -803,9 +803,9 @@
kolab_system("scp $master_host:@CONFIG_DIR@/$fqdn.pem @CONFIG_DIR@/cert.pem");
kolab_system("ssh -CA $master_host \"rm @CONFIG_DIR@/$fqdn.pem @CONFIG_DIR@/$fqdn-req.pem\"");
die("Creation of @CONFIG_DIR@/cert.pem failed") unless -f "@CONFIG_DIR@/cert.pem";
- kolab_system("chgrp @ldapserver_rgrp@ @CONFIG_DIR@/key.pem;");
+ kolab_system("chgrp $Kolab::config{'ldapserver_rgrp'} @CONFIG_DIR@/key.pem;");
kolab_system("chmod 0640 @CONFIG_DIR@/key.pem;");
- kolab_system("chgrp @ldapserver_rgrp@ @CONFIG_DIR@/cert.pem;");
+ kolab_system("chgrp $Kolab::config{'ldapserver_rgrp'} @CONFIG_DIR@/cert.pem;");
kolab_system("chmod 0640 @CONFIG_DIR@/cert.pem;");
print <<'EOS';
More information about the commits
mailing list