Fix checking whether kqueue is available.

[user/henk/code/inspircd.git] / make / gnutlscert.pm

diff --git a/make/gnutlscert.pm b/make/gnutlscert.pm
index a67be0cfdac005981f23c31adb0f5e1bd9a5e330..2c46e0e63e82b6eacb1e3beb1edc180ba38363b5 100644 (file)
--- a/make/gnutlscert.pm
+++ b/make/gnutlscert.pm
@@ -29,17 +29,26 @@ use Exporter 'import';
 use make::configure;
 our @EXPORT = qw(make_gnutls_cert);
 
+# On OS X the GnuTLS certtool is prefixed to avoid collision with the system certtool.
+my $certtool = $^O eq 'darwin' ? 'gnutls-certtool' : 'certtool';
 
 sub make_gnutls_cert()
 {
+       if (system "$certtool --version >/dev/null 2>&1")
+       {
+               print "\e[1;31mError:\e[0m unable to find '$certtool' in the PATH!\n";
+               return 1;
+       }
        open (FH, ">certtool.template");
        my $timestr = time();
-       my $org = promptstring_s("Please enter the organization name", "My IRC Network");
-       my $unit = promptstring_s("Please enter the unit Name", "Server Admins");
-       my $state = promptstring_s("Please enter your state (two letter code)", "CA");
-       my $country = promptstring_s("Please enter your country", "Oompa Loompa Land");
-       my $commonname = promptstring_s("Please enter the certificate common name (hostname)", "irc.mynetwork.com");
-       my $email = promptstring_s("Please enter a contact email address", "oompa\@loompa.com");
+       my $commonname = promptstring_s('What is the hostname of your server?', 'irc.example.com');
+       my $email = promptstring_s('What email address can you be contacted at?', 'example@example.com');
+       my $unit = promptstring_s('What is the name of your unit?', 'Server Admins');
+       my $org = promptstring_s('What is the name of your organization?', 'Example IRC Network');
+       my $city = promptstring_s('What city are you located in?', 'Example City');
+       my $state = promptstring_s('What state are you located in?', 'Example State');
+       my $country = promptstring_s('What is the ISO 3166-1 code for the country you are located in?', 'XZ');
+       my $days = promptstring_s('How many days do you want your certificate to be valid for?', '365');
        print FH <<__END__;
 # X.509 Certificate options
 #
@@ -52,13 +61,13 @@ organization = "$org"
 unit = "$unit"
 
 # The locality of the subject.
-# locality =
+locality = "$city"
 
 # The state of the certificate owner.
 state = "$state"
 
 # The country of the subject. Two letter code.
-country = $country
+country = "$country"
 
 # The common name of the certificate owner.
 cn = "$commonname"
@@ -80,7 +89,7 @@ cn = "$commonname"
 serial = $timestr
 
 # In how many days, counting from today, this certificate will expire.
-expiration_days = 700
+expiration_days = $days
 
 # X.509 v3 extensions
 
@@ -131,12 +140,6 @@ ocsp_signing_key
 time_stamping_key
 __END__
 close(FH);
-my $certtool = "certtool";
-if (`uname -s` eq "Darwin\n") {
-       # On OS X the certtool binary name is different to prevent
-       # collisions with the system certtool from NSS.
-       $certtool = "gnutls-certtool";
-}
 if ( (my $status = system("$certtool --generate-privkey --outfile key.pem")) ne 0) { return 1; }
 if ( (my $status = system("$certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem --template certtool.template")) ne 0) { return 1; }
 unlink("certtool.template");