Fix checking whether kqueue is available.

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

diff --git a/make/opensslcert.pm b/make/opensslcert.pm
index fd7bd6998070a3113ef8e7735f7eaf78cd3337f9..1bf27df159f7f50993e3bb0c0ead13a5bb7a7bfd 100644 (file)
--- a/make/opensslcert.pm
+++ b/make/opensslcert.pm
@@ -32,14 +32,20 @@ our @EXPORT = qw(make_openssl_cert);
 
 sub make_openssl_cert()
 {
+       if (system 'openssl version >/dev/null 2>&1')
+       {
+               print "\e[1;31mCertificate generation failed:\e[0m unable to find 'openssl' in the PATH!\n";
+               return;
+       }
        open (FH, ">openssl.template");
-       my $org = promptstring_s("Please enter the organization name", "My IRC Network");
-       my $unit = promptstring_s("Please enter the unit Name", "Server Admins");
-       my $country = promptstring_s("Please enter your country (two letter code)", "US");
-       my $state = promptstring_s("Please enter your state or locality name", "Alaska");
-       my $city = promptstring_s("Please enter your city", "Factory Town");
-       my $email = promptstring_s("Please enter a contact email address", "oompa\@loompa.com");
-       my $commonname = promptstring_s("Please enter the common name (domain name) of the irc server", "example.inspircd.org");
+       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 $time = promptstring_s('How many days do you want your certificate to be valid for?', '365');
        print FH <<__END__;
 $country
 $state
@@ -50,9 +56,6 @@ $commonname
 $email
 __END__
 close(FH);
-
-my $time = promptstring_s("Please enter the number of days that this certificate is valid for","365");
-
 system("cat openssl.template | openssl req -x509 -nodes -newkey rsa:1024 -keyout key.pem -out cert.pem -days $time 2>/dev/null");
 system("openssl dhparam -out dhparams.pem 1024");
 unlink("openssl.template");