print "no ($config{OSNAME})\n";
}
+print "Checking for upgrades to extra and third party modules... ";
+system "./modulemanager upgrade";
+
################################################################################
# BEGIN INTERACTIVE PART #
################################################################################
}
our $failed = 0;
+$config{CERTGEN} ||= 'y';
+yesno('CERTGEN',"Would you like generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y"));
+
if ($config{USE_GNUTLS} eq "y") {
unless (-r "src/modules/m_ssl_gnutls.cpp") {
print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
symlink "extra/m_ssl_gnutls.cpp", "src/modules/m_ssl_gnutls.cpp" or print STDERR "Symlink failed: $!";
}
- getmodules();
- if ($interactive)
+ if ($interactive && $config{CERTGEN} eq 'y')
{
unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
print "SSL Certificates Not found, Generating.. \n\n
{
print "Skipping SSL certificate generation\nin non-interactive mode.\n\n";
}
-} elsif ($config{USE_OPENSSL} eq "y") {
+}
+
+if ($config{USE_OPENSSL} eq "y") {
unless (-r "src/modules/m_ssl_openssl.cpp") {
print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
symlink "extra/m_ssl_openssl.cpp", "src/modules/m_ssl_openssl.cpp" or print STDERR "Symlink failed: $!";
}
- getmodules();
$failed = 0;
- if ($interactive)
+ if ($interactive && $config{CERTGEN} eq 'y')
{
unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
print "SSL Certificates Not found, Generating.. \n\n
if (defined(opendir(MDIRHANDLE, "src/modules/$name2"))) {
closedir(MDIRHANDLE);
$modules .= "$name2.so ";
- $uninstall_list = $uninstall_list . " -rm \$(MODULES)/$name2.so\n";
+ $uninstall_list = $uninstall_list . " -rm \$(MODPATH)/$name2.so\n";
}
}
}
commands:
@${MAKE} -C commands $(MAKEARGS) commands
-modes/modeclasses.a: $(RELCPPFILES)
+modes/modeclasses.a: $(RELCPPFILES) ../include/inspircd.h ../include/inspircd_config.h
@${MAKE} -C modes $(MAKEARGS) CPPFILES="$(CPPFILES)" modeclasses.a
EOM