martin: server/kolabd/kolabd kolab_bootstrap,1.10,1.11
cvs at intevation.de
cvs at intevation.de
Tue Mar 29 02:02:46 CEST 2005
Author: martin
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv24437
Modified Files:
kolab_bootstrap
Log Message:
Martin K.: Try to catch more cases in order to avoid poeple falling into DNS issues
Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab_bootstrap 20 Jan 2005 06:19:06 -0000 1.10
+++ kolab_bootstrap 29 Mar 2005 00:02:44 -0000 1.11
@@ -2,7 +2,7 @@
# (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
# (c) 2003,2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003.2004 Martin Konold <martin.konold at erfrakon.de>
+# (c) 2003-2005 Martin Konold <martin.konold at erfrakon.de>
# (c) 2003 Achim Frank <achim.frank at erfrakon.de>
#
# This program is Free Software under the GNU General Public License (>=v2).
@@ -41,6 +41,11 @@
chomp $host;
close( HOSTNAME );
}
+ if( open( hostname, '/etc/hostname' ) ) {
+ $host = <hostname>;
+ chomp $host;
+ close( hostname );
+ }
if( $host eq '' ) {
$host = `hostname`;
}
@@ -248,7 +253,7 @@
}
chomp($fqdn);
-$fqdn = getUserInput("Please enter Hostname", $fqdn);
+$fqdn = getUserInput("Please enter Hostname inclding Domain Name (e.g. thishost.domain.tld)", $fqdn);
print "Proceeding with Hostname $fqdn\n";
my $tmp;
@@ -277,8 +282,10 @@
$domain = $fqdn;
}
- $domain = getUserInput("Please enter your Maildomain", $domain);
+ $domain = getUserInput("Please enter your Maildomain - if you do not know your mail domain use the fqdn from above", $domain);
print "proceeding with Maildomain $domain\n";
+ print "Kolab primary email addresses will be of the type user@$domain \n";
+
if ( $opt_f || $base_dn =~ /\@\@\@/ || $bind_dn =~ /\@\@\@/ || $bind_pw =~ /\@\@\@/ ) {
print "Generating default configuration:\n";
More information about the commits
mailing list