Store generated SSL certificates in the .configure directory.

Co-Authored-By: Nicole Kleinhoff <ilbelkyr@shalture.org>

diff --git a/configure b/configure
index 5c99c2b457c9e7dcce1d53172f745a84bb235bdb..767929a1d280df4b35638e3cb7edc8f6bba8c855 100755 (executable)
--- a/configure
+++ b/configure
@@ -393,9 +393,10 @@ EOQ
 
 if (<$RealDir/src/modules/m_ssl_*.cpp>) {
        if (prompt_bool $interactive, $question, $interactive) {
-               system './tools/genssl', 'auto';
+               create_directory CONFIGURE_DIRECTORY, 0750 or print_error "unable to create ${\CONFIGURE_DIRECTORY}: $!";
+               system './tools/genssl', 'auto', CONFIGURE_DIRECTORY;
        } else {
-               my @pems = <$RealDir/{cert,csr,dhparams,key}.pem>;
+               my @pems = <${\CONFIGURE_DIRECTORY}/{cert,csr,dhparams,key}.pem>;
                $question = <<EOQ;
 The following self-signed files were previously generated and will be installed
 when you run Make. Do you want to delete them?

diff --git a/make/configure.pm b/make/configure.pm
index cb9b8f640475b4404df0d89f20caa97d5e7c8938..fd1833d5fe1515cc9fcabc74566081a95b2f735d 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -45,6 +45,7 @@ use constant CONFIGURE_ERROR_PIPE    => $ENV{INSPIRCD_VERBOSE} ? '' : '1>/dev/nu
 
 our @EXPORT = qw(CONFIGURE_CACHE_FILE
                  CONFIGURE_CACHE_VERSION
+                 CONFIGURE_DIRECTORY
                  cmd_clean
                  cmd_help
                  cmd_update

diff --git a/make/template/inspircd-genssl.1 b/make/template/inspircd-genssl.1
index 93f05ff583dc4bb2f7b2a8d0dac56760f2137447..7a1f70c6a1e68f3404840476c97fec75647c2946 100644 (file)
--- a/make/template/inspircd-genssl.1
+++ b/make/template/inspircd-genssl.1
@@ -24,7 +24,7 @@
 .BR
 
 .SH "SYNOPSIS"
-\t\fBinspircd-genssl\fR [ auto | gnutls | openssl ]
+\t\fBinspircd-genssl\fR [ auto | gnutls | openssl ] [ SSL-DIR ]
 
 .SH "OPTIONS"
 .TP

diff --git a/make/template/main.mk b/make/template/main.mk
index 9f905f970d76d5f78dbb4f81b32b861831250c48..5a2107d3d2f948095d1d958e2aa18732fef99350 100644 (file)
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -250,7 +250,7 @@ endif
        -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
        -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
        -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
-       -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
+       -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null
        @echo ""
        @echo "*************************************"
        @echo "*        INSTALL COMPLETE!          *"

diff --git a/tools/genssl b/tools/genssl
index 930f4b1d71e35b5690ca6b297a18ef631fc82734..f4c38fd2e469f0f883d746161ae3dc99934f1923 100755 (executable)
--- a/tools/genssl
+++ b/tools/genssl
@@ -31,10 +31,18 @@ use File::Temp();
 # IMPORTANT: This script has to be able to run by itself so that it can be used
 #            by binary distributions where the make/console.pm module will not
 #            be available!
+eval {
+       use File::Basename qw(dirname);
+       use FindBin        qw($RealDir);
+
+       use lib dirname $RealDir;
+       require make::console;
+       make::console->import();
+};
 
 sub prompt($$) {
        my ($question, $default) = @_;
-       return prompt_string(1, $question, $default) if eval 'use File::Basename; use FindBin; use lib dirname($FindBin::RealDir); use make::console; 1';
+       return prompt_string(1, $question, $default) if defined main->can('prompt_string');
        say $question;
        print "[$default] => ";
        chomp(my $answer = <STDIN>);
@@ -42,8 +50,8 @@ sub prompt($$) {
        return $answer ? $answer : $default;
 }
 
-if ($#ARGV != 0 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) {
-       say STDERR "Usage: $0 <auto|gnutls|openssl>";
+if (scalar @ARGV < 1 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) {
+       say STDERR "Usage: $0 <auto|gnutls|openssl> [SSL-DIR]";
        exit 1;
 }
 
@@ -75,6 +83,12 @@ if ($tool eq 'auto') {
        exit 1;
 }
 
+# Output to the cwd unless an SSL directory is specified.
+if (scalar @ARGV > 1 && !chdir $ARGV[1]) {
+       say STDERR "Unable to change the working directory to $ARGV[1]: $!.";
+       exit 1;
+}
+
 # Harvest information needed to generate the certificate.
 my $common_name = prompt('What is the hostname of your server?', 'irc.example.com');
 my $email = prompt('What email address can you be contacted at?', 'example@example.com');