Miscellaneous improvements to configure.

- Clean up various minor sections of the code. - Remove OpenSSL and GnuTLS detection plumbing. - This will soon be the job of modulemanager. - This did not work in non-interactive mode unlike --enable-extras. - Rework runas user handling. - Add the --gid configure option. - Accept either an id or a name in --gid and --uid. - Rework the question flow in interactive mode. - User is no longer asked detailed questions unless they want them. - Socket engine questions have been removed. - Automatically enable non-interactive mode if STDIN or STDOUT are not a tty.
2025-03-09 10:39:02 -04:00 · 2014-10-01 19:52:25 +01:00 · 2014-10-01 19:52:25 +01:00 · 500a0524d9
commit 500a0524d9
parent 11f4d02e70
5 changed files with 249 additions and 320 deletions
--- a/466
+++ b/466
@ -33,18 +33,28 @@ BEGIN {
 use strict;
 use warnings FATAL => qw(all);

-use File::Copy ();
+use File::Basename        qw(basename);
+use File::Copy            ();
 use File::Spec::Functions qw(rel2abs);
-use Cwd;
-use Getopt::Long;
+use Getopt::Long          qw(GetOptions);
+use POSIX                 qw(getgid getuid);

 use make::configure;
 use make::console;
 use make::utilities;

-our ($opt_use_gnutls, $opt_use_openssl, $opt_nointeractive, $opt_socketengine,
-     $opt_system, $opt_uid, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir,
-     $opt_data_dir, $opt_log_dir);
+my ($opt_binary_dir,
+    $opt_config_dir,
+    $opt_data_dir,
+    $opt_disable_interactive,
+    $opt_gid,
+    $opt_log_dir,
+    $opt_manual_dir,
+    $opt_module_dir,
+    $opt_prefix,
+    $opt_socketengine,
+    $opt_system,
+    $opt_uid);

 sub list_extras ();

@ -55,25 +65,28 @@ sub disable_extras (@);
 my @opt_enableextras;
 my @opt_disableextras;

-GetOptions (
-	'enable-gnutls' => \$opt_use_gnutls,
-	'system' => \$opt_system,
-	'uid=s' => \$opt_uid,
-	'enable-openssl' => \$opt_use_openssl,
-	'disable-interactive' => \$opt_nointeractive,
-	'socketengine=s' => \$opt_socketengine,
-	'prefix=s' => \$opt_base_dir,
-	'config-dir=s' => \$opt_config_dir,
-	'module-dir=s' => \$opt_module_dir,
-	'binary-dir=s' => \$opt_binary_dir,
-	'data-dir=s' => \$opt_data_dir,
-	'log-dir=s' => \$opt_log_dir,
-	'help'	=> \&cmd_help,
+GetOptions(
+	'clean'  => \&cmd_clean,
+	'help'	 => \&cmd_help,
 	'update' => \&cmd_update,
-	'clean' => \&cmd_clean,
-	'list-extras' => sub { list_extras; exit 0; }, # This, --enable-extras, and --disable-extras are for non-interactive managing.
-	'enable-extras=s@' => \@opt_enableextras, # ^
-	'disable-extras=s@' => \@opt_disableextras, # ^
+
+	'disable-interactive' => \$opt_disable_interactive,
+	'binary-dir=s'        => \$opt_binary_dir,
+	'config-dir=s'        => \$opt_config_dir,
+	'data-dir=s'          => \$opt_data_dir,
+	'gid=s'               => \$opt_gid,
+	'log-dir=s'           => \$opt_log_dir,
+	'manual-dir=s'        => \$opt_manual_dir,
+	'module-dir=s'        => \$opt_module_dir,
+	'prefix=s'            => \$opt_prefix,
+	'socketengine=s'      => \$opt_socketengine,
+	'system'              => \$opt_system,
+	'uid=s'               => \$opt_uid,
+
+	# TODO: when the modulemanager rewrite is done these should be removed.
+	'disable-extras=s@' => \@opt_disableextras,
+	'enable-extras=s@'  => \@opt_enableextras,
+	'list-extras'       => sub { list_extras; exit 0; },
 );

 if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
@ -87,81 +100,30 @@ if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
 }

 our $interactive = !(
-	(defined $opt_base_dir) ||
-	(defined $opt_config_dir) ||
-	(defined $opt_module_dir) ||
-	(defined $opt_base_dir) ||
-	(defined $opt_binary_dir) ||
-	(defined $opt_data_dir) ||
-	(defined $opt_log_dir) ||
-	(defined $opt_nointeractive) ||
-	(defined $opt_socketengine) ||
-	(defined $opt_use_openssl) ||
-	(defined $opt_system) ||
-	(defined $opt_uid) ||
-	(defined $opt_use_gnutls)
+	!-t STDIN ||
+	!-t STDOUT ||
+	defined $opt_binary_dir ||
+	defined $opt_config_dir ||
+	defined $opt_data_dir ||
+	defined $opt_disable_interactive ||
+	defined $opt_gid ||
+	defined $opt_log_dir ||
+	defined $opt_manual_dir ||
+	defined $opt_module_dir ||
+	defined $opt_prefix ||
+	defined $opt_socketengine ||
+	defined $opt_system ||
+	defined $opt_uid
 );

+my %version = get_version();
+print_format "<|BOLD Configuring InspIRCd $version{MAJOR}.$version{MINOR}.$version{PATCH}+$version{LABEL} on $^O.|>\n";
+
 our %config = read_configure_cache();

 print "Checking for cache from previous configure... ";
 print %config ? "found\n" : "not found\n";

-$config{BASE_DIR} = getcwd()."/run";
-
-if (defined $opt_base_dir) {
-	$config{BASE_DIR} = $opt_base_dir;
-} elsif (defined $opt_system) {
-	$config{BASE_DIR} = '/var/lib/inspircd';
-}
-
-if (defined $opt_system) {
-	$config{UID} = defined $opt_uid ? $opt_uid : 'ircd';
-	$config{CONFIG_DIR} = '/etc/inspircd';
-	$config{MODULE_DIR} = '/usr/lib/inspircd';
-	$config{BINARY_DIR} = '/usr/sbin/';
-	$config{DATA_DIR} = '/var/inspircd';
-	$config{LOG_DIR} = '/var/log/inspircd';
-} else {
-	$config{UID} = defined $opt_uid ? $opt_uid : $<;
-	$config{CONFIG_DIR} = rel2abs($config{BASE_DIR}."/conf");
-	$config{MODULE_DIR} = rel2abs($config{BASE_DIR}."/modules");
-	$config{BINARY_DIR} = rel2abs($config{BASE_DIR}."/bin");
-	$config{DATA_DIR} = rel2abs($config{BASE_DIR}."/data");
-	$config{LOG_DIR} = rel2abs($config{BASE_DIR}."/logs");
-}
-
-if (defined $opt_config_dir) {
-	$config{CONFIG_DIR} = $opt_config_dir;
-}
-if (defined $opt_module_dir) {
-	$config{MODULE_DIR} = $opt_module_dir;
-}
-if (defined $opt_binary_dir) {
-	$config{BINARY_DIR} = $opt_binary_dir;
-}
-if (defined $opt_data_dir) {
-	$config{DATA_DIR} = $opt_data_dir;
-}
-if (defined $opt_log_dir) {
-	$config{LOG_DIR} = $opt_log_dir;
-}
-chomp($config{HAS_GNUTLS}   = `pkg-config --modversion gnutls 2>/dev/null`);
-chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);
-
-chomp(our $gnutls_ver = $config{HAS_GNUTLS});
-chomp(our $openssl_ver = $config{HAS_OPENSSL});
-$config{USE_GNUTLS}	    = 0;
-if (defined $opt_use_gnutls)
-{
-	$config{USE_GNUTLS} = "y";					# Use gnutls.
-}
-$config{USE_OPENSSL}	= 0;						# Use openssl.
-if (defined $opt_use_openssl)
-{
-	$config{USE_OPENSSL} = "y";
-}
-
 $config{CXX} = defined $ENV{CXX} && !system("$ENV{CXX} -v > /dev/null 2>&1") ? $ENV{CXX} : find_compiler();
 if ($config{CXX} eq "") {
 	print "A C++ compiler could not be detected on your system!\n";
@ -169,19 +131,13 @@ if ($config{CXX} eq "") {
 	exit 1;	
 }

-our %cxx = get_compiler_info($config{CXX});
-if ($cxx{UNSUPPORTED}) {
+my %compiler = get_compiler_info($config{CXX});
+if ($compiler{UNSUPPORTED}) {
 	print "Your C++ compiler is too old to build InspIRCd!\n";
-	print "Reason: $cxx{REASON}\n";
+	print "Reason: $compiler{REASON}\n";
 	exit 1;
 }

-if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
-	$config{HAS_OPENSSL} = $1;
-} else {
-	$config{HAS_OPENSSL} = "";
-}
-
 $config{HAS_CLOCK_GETTIME} = run_test 'clock_gettime()', test_file($config{CXX}, 'clock_gettime.cpp', '-lrt');
 $config{HAS_EVENTFD} = run_test 'eventfd()', test_file($config{CXX}, 'eventfd.cpp');

@ -203,10 +159,10 @@ if ($config{HAS_POLL} = run_test 'poll', test_header($config{CXX}, 'poll.h')) {

 # Select is available on all platforms
 $config{HAS_SELECT} = 1;
-$config{SOCKETENGINE} ||= "select";
+$config{SOCKETENGINE} ||= 'select';

 if (defined $opt_socketengine) {
-	my $cfgkey = "HAS_" . uc $opt_socketengine;
+	my $cfgkey = 'HAS_' . uc $opt_socketengine;
 	if ($config{$cfgkey} && -f "src/socketengines/socketengine_$opt_socketengine.cpp") {
 		$config{SOCKETENGINE} = $opt_socketengine;
 	} else {
@ -214,221 +170,159 @@ if (defined $opt_socketengine) {
 		print "Available socket engines are:";
 		foreach (<src/socketengines/socketengine_*.cpp>) {
 			s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
-			print " $1" if $config{"HAS_" . uc $1};
+			print " $1" if $config{'HAS_' . uc $1};
 		}
 		print "\n";	
 		exit 1;
 	}
 }

-print "Checking for libgnutls... ";
-if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) {
-	if (defined($gnutls_ver) && ($gnutls_ver ne "")) {
-		print "yes\n";
-		$config{HAS_GNUTLS} = "y";
-	} else {
-		print "no\n";
-		$config{HAS_GNUTLS} = "n";
-	}
+if (defined $opt_system) {
+	$config{BASE_DIR}   = $opt_prefix     || '/var/lib/inspircd';
+	$config{BINARY_DIR} = $opt_binary_dir || '/usr/sbin';
+	$config{CONFIG_DIR} = $opt_config_dir || '/etc/inspircd';
+	$config{DATA_DIR}   = $opt_data_dir   || '/var/inspircd';
+	$config{LOG_DIR}    = $opt_module_dir || '/var/log/inspircd';
+	$config{MANUAL_DIR} = $opt_manual_dir || '/usr/share/man/man1';
+	$config{MODULE_DIR} = $opt_module_dir || '/usr/lib/inspircd';
 } else {
-	print "no\n";
-	$config{HAS_GNUTLS} = "n";
+	$config{BASE_DIR}   = $opt_prefix     || $config{BASE_DIR}   || rel2abs 'run';
+	$config{BINARY_DIR} = $opt_binary_dir || $config{BINARY_DIR} || rel2abs $config{BASE_DIR} . '/bin';
+	$config{CONFIG_DIR} = $opt_config_dir || $config{CONFIG_DIR} || rel2abs $config{BASE_DIR} . '/conf';
+	$config{DATA_DIR}   = $opt_data_dir   || $config{DATA_DIR}   || rel2abs $config{BASE_DIR} . '/data';
+	$config{LOG_DIR}    = $opt_log_dir    || $config{LOG_DIR}    || rel2abs $config{BASE_DIR} . '/logs';
+	$config{MANUAL_DIR} = $opt_manual_dir || $config{MANUAL_DIR} || rel2abs $config{BASE_DIR} . '/manuals';
+	$config{MODULE_DIR} = $opt_module_dir || $config{MODULE_DIR} || rel2abs $config{BASE_DIR} . '/modules';
 }

-print "Checking for openssl... ";
-if (defined($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y"))) {
-	if (defined($openssl_ver) && ($openssl_ver ne "")) {
-		print "yes\n";
-		$config{HAS_OPENSSL} = "y";
-	} else {
-		print "no\n";
-		$config{HAS_OPENSSL} = "n";
-	}
+# Parse --gid=123 or --gid=foo and extract the group id.
+my @group;
+if (defined $opt_gid) {
+	@group = $opt_gid =~ /^\d+$/ ? getgrgid($opt_gid) : getgrnam($opt_gid);
+	print_error "there is no '$opt_gid' group on this system!" unless @group;
 } else {
-	print "no\n";
-	$config{HAS_OPENSSL} = "n";
+	@group = $opt_system ? getgrnam('irc') : getgrgid($config{GID} || getgid());
+	print_error "you need to specify a group to run as using '--gid [id|name]'!" unless @group;
 }
+$config{GROUP} = $group[0];
+$config{GID}   = $group[2];

-if ($interactive)
-{
-	# Clear the screen.
-	system 'tput', 'clear';
+# Parse --uid=123 or --uid=foo and extract the user id.
+my @user;
+if (defined $opt_uid) {
+	@user = $opt_uid =~ /^\d+$/ ? getpwuid($opt_uid) : getpwnam($opt_uid);
+	print_error "there is no '$opt_uid' user on this system!" unless @user;
+} else {
+	@user = $opt_system ? getpwnam('irc') : getpwuid($config{UID} || getuid());
+	print_error "you need to specify a user to run as using '--uid [id|name]'!" unless @user;
+}
+$config{USER} = $user[0];
+$config{UID}  = $user[2];

-	my %version = get_version();
+# Clear the screen.
+system 'tput', 'clear' if $interactive;

-	# Display Introduction Message..
-	print <<"STOP" ;
-Welcome to the \e[1mInspIRCd\e[0m configuration program! (\e[1minteractive mode\e[0m)
-\e[1mPackage maintainers: Type ./configure --help for non-interactive help\e[0m
-
-*** If you are unsure of any of these values, leave it blank for    ***
-*** standard settings that will work, and your server will run      ***
-*** using them. Please consult your IRC network admin if in doubt.  ***
-
-Press \e[1m<RETURN>\e[0m to accept the default for any option, or enter
-a new value. Please note: You will \e[1mHAVE\e[0m to read the docs
-dir, otherwise you won't have a config file!
-
-Your operating system is: \e[1;32m$^O\e[0m 
-STOP
-	print "Your InspIRCd version is: \e[1;32m";
-	print "$version{MAJOR}.$version{MINOR}.$version{PATCH}+$version{LABEL}";
-	print "\e[0m\n\n";
-	print "The following compiler has been detected: \e[1;32m$cxx{NAME} $cxx{VERSION}\e[0m ($config{CXX})\n\n";
-
-	# Check that the user actually wants this version.
-	if ($version{LABEL} ne 'release') {
-		print_warning <<'EOW';
+# Check that the user actually wants this version.
+if ($version{LABEL} ne 'release' && $interactive) {
+	print_warning <<'EOW';
 You are building a development version. This contains code which has
 not been tested as heavily and may contain various faults which could seriously
 affect the running of your server. It is recommended that you use a stable
 version instead.

-You can obtain the latest stable version from https://github.com/inspircd/inspircd/releases
-or by running `git checkout insp20` if you are installing from Git.
+You can obtain the latest stable version from http://www.inspircd.org/ or by
+running `git checkout insp20` if you are installing from Git.

 EOW
-	exit 1 unless prompt_bool(1, 'I understand this warning and want to continue anyway.', 0);
-	}
-
-	# Directory Settings..
-	my $tmpbase = $config{BASE_DIR};
-	$config{BASE_DIR} = prompt_dir(1, 'What directory do you wish to install the InspIRCd base?', $config{BASE_DIR});
-	if ($tmpbase ne $config{BASE_DIR}) {
-		$config{CONFIG_DIR} = rel2abs($config{BASE_DIR}."/conf");
-		$config{MODULE_DIR} = rel2abs($config{BASE_DIR}."/modules");
-		$config{DATA_DIR} = rel2abs($config{BASE_DIR}."/data");
-		$config{LOG_DIR} = rel2abs($config{BASE_DIR}."/logs");
-		$config{BINARY_DIR} = rel2abs($config{BASE_DIR}."/bin");
-	}
-
-	$config{BINARY_DIR} = prompt_dir(1, 'In what directory should the InspIRCd binary be placed?', $config{BINARY_DIR});
-	$config{CONFIG_DIR} = prompt_dir(1, 'In what directory are the configuration files to be stored?', $config{CONFIG_DIR});
-	$config{DATA_DIR} = prompt_dir(1, 'In what directory are variable data files to be stored?', $config{DATA_DIR});
-	$config{LOG_DIR} = prompt_dir(1, 'In what directory are log files to be stored?', $config{LOG_DIR});
-	$config{MODULE_DIR} = prompt_dir(1, 'In what directory are the modules to be placed?', $config{MODULE_DIR});
-
-	my $chose_hiperf = 0;
-	if ($config{HAS_KQUEUE}) {
-		$config{USE_KQUEUE} = prompt_bool(1, 'Your operating system has support for the high performance kqueue socket engine. Would you like to enable it?', 1);
-		if ($config{USE_KQUEUE}) {
-			$config{SOCKETENGINE} = "kqueue";
-			$chose_hiperf = 1;
-		}
-	}
-	if ($config{HAS_EPOLL}) {
-		$config{USE_EPOLL} = prompt_bool(1, 'Your operating system has support for the high performance epoll socket engine. Would you like to enable it?', 1);
-		if ($config{USE_EPOLL}) {
-			$config{SOCKETENGINE} = "epoll";
-			$chose_hiperf = 1;
-		}
-	}
-	if ($config{HAS_PORTS}) {
-		$config{USE_PORTS} = prompt_bool(1, 'Your operating system has support for the high performance IOCP socket engine. Would you like to enable it?', 1);
-		if ($config{USE_PORTS}) {
-			$config{SOCKETENGINE} = "ports";
-			$chose_hiperf = 1;
-		}
-	}
-
-	if (!$chose_hiperf && $config{HAS_POLL}) {
-		$config{USE_POLL} = prompt_bool(1, 'Your operating system has support for the mid performance poll socket engine. Would you like to enable it?', 1);
-		if ($config{USE_POLL}) {
-			$config{SOCKETENGINE} = "poll";
-		}
-	}
-	unless ($chose_hiperf || $config{USE_POLL})
-	{
-		print "No high-performance socket engines are available, or you chose not to enable one. Defaulting to select() engine.\n\n";
-		$config{SOCKETENGINE} = "select";
-	}
-
-	if ($config{HAS_GNUTLS} eq "y" || $config{HAS_OPENSSL} eq "y")
-	{
-		print "Detected GnuTLS version: \e[1;32m" . $gnutls_ver . "\e[0m\n";
-		print "Detected OpenSSL version: \e[1;32m" . $openssl_ver . "\e[0m\n\n";
-
-		$config{USE_SSL} = prompt_bool(1, 'One or more SSL libraries detected. Would you like to enable SSL support?', 1);
-		if ($config{USE_SSL})
-		{
-			if ($config{HAS_GNUTLS} eq "y")
-			{
-				$config{USE_GNUTLS} = prompt_bool(1, 'Would you like to enable SSL with m_ssl_gnutls (recommended)?', 1);
-				if ($config{USE_GNUTLS})
-				{
-					print "Using GnuTLS SSL module.\n\n";
-					unlink 'src/modules/m_ssl_gnutls.cpp' if -f 'src/modules/m_ssl_gnutls.cpp';
-					symlink "extra/m_ssl_gnutls.cpp", "src/modules/m_ssl_gnutls.cpp" or print STDERR "Symlink failed: $!\n";
-				}
-			}
-
-			if ($config{HAS_OPENSSL} eq "y")
-			{
-				$config{USE_OPENSSL} = prompt_bool(1, 'Would you like to enable SSL with m_ssl_openssl (recommended)?', 1);
-				if ($config{USE_OPENSSL})
-				{
-					print "Using OpenSSL SSL module.\n\n";
-					unlink 'src/modules/m_ssl_openssl.cpp' if -f 'src/modules/m_ssl_openssl.cpp';
-					symlink "extra/m_ssl_openssl.cpp", "src/modules/m_ssl_openssl.cpp" or print STDERR "Symlink failed: $!\n";
-				}
-			}
-		}
-	}
-	else
-	{
-		print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed and\n";
-		print "is in your path.\n\n";
-	}
+exit 1 unless prompt_bool $interactive, 'I understand this warning and want to continue anyway.', !$interactive;
 }

-# We are on a POSIX system, we can enable POSIX extras without asking
-symlink "extra/m_regex_posix.cpp", "src/modules/m_regex_posix.cpp";
+# Configure directory settings.
+my $question = <<"EOQ";
+Currently, InspIRCd is configured with the following paths:

-if (($config{USE_GNUTLS}) && ($config{HAS_GNUTLS} ne "y"))
-{
-	print "Sorry, but I couldn't detect GnuTLS. Make sure pkg-config is in your path.\n";
-	exit 1;
-}
-if (($config{USE_OPENSSL}) && ($config{HAS_OPENSSL} ne "y"))
-{
-	print "Sorry, but I couldn't detect OpenSSL. Make sure pkg-config is in your path.\n";
-	exit 1;
+<|BOLD Base:|>   $config{BASE_DIR}
+<|BOLD Binary:|> $config{BINARY_DIR}
+<|BOLD Config:|> $config{CONFIG_DIR}
+<|BOLD Data:|>   $config{DATA_DIR}
+<|BOLD Log:|>    $config{LOG_DIR}
+<|BOLD Manual:|> $config{MANUAL_DIR}
+<|BOLD Module:|> $config{MODULE_DIR}
+
+Do you want to change these settings?
+EOQ
+if (prompt_bool $interactive, $question, 0) {
+	my $original_base_dir = $config{BASE_DIR};
+	$config{BASE_DIR} = prompt_dir $interactive, 'In what directory do you wish to install the InspIRCd base?', $config{BASE_DIR};
+	foreach my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_DIR)) {
+		$config{$key} =~ s/^\Q$original_base_dir\E/$config{BASE_DIR}/;
+	}
+	$config{BINARY_DIR} = prompt_dir $interactive, 'In what directory should the InspIRCd binary be placed?',     $config{BINARY_DIR};
+	$config{CONFIG_DIR} = prompt_dir $interactive, 'In what directory are configuration files to be stored?', $config{CONFIG_DIR};
+	$config{DATA_DIR}   = prompt_dir $interactive, 'In what directory are variable data files to be stored?',     $config{DATA_DIR};
+	$config{LOG_DIR}    = prompt_dir $interactive, 'In what directory are log files to be stored?',               $config{LOG_DIR};
+	$config{MANUAL_DIR} = prompt_dir $interactive, 'In what directory are manual pages to be placed?',        $config{MANUAL_DIR};
+	$config{MODULE_DIR} = prompt_dir $interactive, 'In what directory are modules to be placed?',             $config{MODULE_DIR};
 }

-if ($config{USE_GNUTLS} || $config{USE_OPENSSL}) {
-	if (my $val = prompt_bool($interactive, 'Would you like to generate SSL certificates now?', $interactive)) {
-		unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem" && -r "$config{CONFIG_DIR}/dhparams.pem") {
-			unless (system './tools/genssl auto') {
-				print "\nCertificate generation complete, copying to config directory... ";
-				File::Copy::move("key.pem", "$config{CONFIG_DIR}/key.pem") or print STDERR "Could not copy key.pem!\n";
-				File::Copy::move("cert.pem", "$config{CONFIG_DIR}/cert.pem") or print STDERR "Could not copy cert.pem!\n";
-				File::Copy::move("dhparams.pem", "$config{CONFIG_DIR}/dhparams.pem") or print STDERR "Could not copy dhparams.pem!\n";
-				print "Done.\n\n";
-			}
-		} else {
-			print "SSL certificates found, skipping.\n\n"
+# Configure module settings.
+$question = <<'EOQ';
+Currently, InspIRCd is configured to automatically enable all available extra modules.
+
+Would you like to enable extra modules manually?
+EOQ
+if (prompt_bool $interactive, $question, 0) {
+	foreach my $extra (<src/modules/extra/m_*.cpp>) {
+		my $module_name = basename $extra, '.cpp';
+		if (prompt_bool $interactive, "Would you like to enable $module_name?", 0) {
+			enable_extras "$module_name.cpp";
 		}
-	} else {
-		print "Skipping SSL certificate generation in non-interactive mode.\n\n";
 	}
 } else {
-	print "Skipping SSL Certificate generation, SSL support is not available.\n\n";
+	# TODO: finish modulemanager rewrite and replace this code with:
+	# system './modulemanager', 'enable', '--auto';
+	enable_extras 'm_ssl_gnutls.cpp' unless system 'gnutls-cli --version >/dev/null 2>&1';
+	enable_extras 'm_ssl_openssl.cpp' unless system 'openssl --version >/dev/null 2>&1';
 }

-print "Writing \e[1;32m.config.cache\e[0m ...\n";
-write_configure_cache(%config);
-parse_templates(\%config, \%cxx);
-dump_hash();
-
-print "\n";
-print "To build your server with these settings, please run '\e[1;32mmake\e[0m' now.\n";
-if ($config{USE_GNUTLS} || $config{USE_OPENSSL}) {
-	print "Please note: for \e[1;32mSSL support\e[0m you will need to load required\n";
-	print "modules in your config. This configure script has added those modules to the\n";
-	print "build process. For more info, please refer to:\n";
-	print "\e[1;32mhttp://wiki.inspircd.org/Installation_From_Tarball\e[0m\n";
+# Generate SSL certificates.
+if (<src/modules/m_ssl_*.cpp> && prompt_bool $interactive, 'Would you like to generate SSL certificates now?', $interactive) {
+	system './tools/genssl', 'auto';
 }
-print "*** \e[1;32mRemember to edit your configuration files!!!\e[0m ***\n\n";
+
+write_configure_cache %config;
+parse_templates \%config, \%compiler;
+
+print_format <<"EOM";
+
+Configuration is complete! You have chosen to build with the following settings:
+
+<|GREEN Compiler:|>
+  <|GREEN Binary:|>  $config{CXX}
+  <|GREEN Name:|>    $compiler{NAME}
+  <|GREEN Version:|> $compiler{VERSION}
+
+<|GREEN Extra Modules:|> <<TODO>>
+  * m_foo
+  * m_bar
+  * m_baz
+
+<|GREEN Paths:|>
+  <|GREEN Base:|>   $config{BASE_DIR}
+  <|GREEN Binary:|> $config{BINARY_DIR}
+  <|GREEN Config:|> $config{CONFIG_DIR}
+  <|GREEN Data:|>   $config{DATA_DIR}
+  <|GREEN Log:|>    $config{LOG_DIR}
+  <|GREEN Manual:|> $config{MANUAL_DIR}
+  <|GREEN Module:|> $config{MODULE_DIR}
+
+<|GREEN Execution Group:|> $config{GROUP} ($config{GID})
+<|GREEN Execution User:|>  $config{USER} ($config{UID})
+<|GREEN Socket Engine:|>   $config{SOCKETENGINE}
+
+To build with these settings run '<|GREEN make -j${\get_cpu_count}|>' now.
+
+EOM

 # Routine to list out the extra/ modules that have been enabled.
 # Note: when getting any filenames out and comparing, it's important to lc it if the
--- a/make/configure.pm
+++ b/make/configure.pm
@ -30,20 +30,27 @@ package make::configure;
 use strict;
 use warnings FATAL => qw(all);

-use Cwd 'getcwd';
-use Exporter 'import';
-use File::Basename 'basename';
+use Cwd            qw(getcwd);
+use Exporter       qw(import);
+use File::Basename qw(basename);

 use make::console;
 use make::utilities;

-our @EXPORT = qw(cmd_clean cmd_help cmd_update
-                 read_configure_cache write_configure_cache
-                 get_compiler_info find_compiler
-                 run_test test_file test_header
-                 dump_hash get_property parse_templates);
+our @EXPORT = qw(cmd_clean
+                 cmd_help
+                 cmd_update
+                 read_configure_cache
+                 write_configure_cache
+                 get_compiler_info
+                 find_compiler
+                 run_test
+                 test_file
+                 test_header
+                 get_property
+                 parse_templates);

-sub __get_socketengines() {
+sub __get_socketengines {
 	my @socketengines;
 	foreach (<src/socketengines/socketengine_*.cpp>) {
 		s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
@ -59,7 +66,7 @@ sub __get_template_settings($$) {
 	# These are actually hash references
 	my ($config, $compiler) = @_;

-	# Start off by populating with the config
+	# Start off by populating with the config
 	my %settings = %$config;

 	# Compiler information
@ -112,11 +119,11 @@ PATH OPTIONS
                                [$PWD/run/data]
  --log-dir=[dir]               The location where the log files are stored.
                                [$PWD/run/logs]
+  --manual-dir=[dir]            The location where the manual files are stored.
+                                [$PWD/run/manuals]
  --module-dir=[dir]            The location where the loadable modules are
                                stored.
                                [$PWD/run/modules]
-  --build-dir=[dir]             The location to store files in while building.
-

 EXTRA MODULE OPTIONS

@ -130,10 +137,11 @@ MISC OPTIONS
  --clean                       Remove the configuration cache file and start
                                the interactive configuration wizard.
  --disable-interactive         Disables the interactive configuration wizard.
+  --gid=[id|name]               Sets the group to run InspIRCd as.
  --help                        Show this message and exit.
-  --uid=[name]                  Sets the user to run InspIRCd as.
  --socketengine=[name]         Sets the socket engine to be used. Possible
                                values are $SELIST.
+  --uid=[id|name]               Sets the user to run InspIRCd as.
  --update                      Updates the build environment.


@ -173,14 +181,14 @@ sub read_configure_cache {
 }

 sub write_configure_cache(%) {
+	print_format "Writing <|GREEN .config.cache|> ...\n";
 	my %cfg = @_;
-	open(CACHE, ">.config.cache") or return 0;
+	open(CACHE, '>.config.cache') or print_error "unable to write .config.cache: $!";
 	while (my ($key, $value) = each %cfg) {
 		$value = "" unless defined $value;
 		print CACHE "$key=\"$value\"\n";
 	}
 	close(CACHE);
-	return 1;
 }

 sub get_compiler_info($) {
@ -226,8 +234,8 @@ sub find_compiler {

 sub run_test($$) {
 	my ($what, $result) = @_;
-	print "Checking whether $what is available... ";
-	print $result ? "yes\n" : "no\n";
+	print_format "Checking whether <|GREEN $what|> is available ... ";
+	print_format $result ? "<|GREEN yes|>\n" : "<|RED no|>\n";
 	return $result;
 }

@ -265,19 +273,6 @@ sub get_property($$;$)
 	return defined $default ? $default : '';
 }

-sub dump_hash() {
-	print "\n\e[1;32mPre-build configuration is complete!\e[0m\n\n";
-	print "\e[0mBase install path:\e[1;32m\t\t$main::config{BASE_DIR}\e[0m\n";
-	print "\e[0mConfig path:\e[1;32m\t\t\t$main::config{CONFIG_DIR}\e[0m\n";
-	print "\e[0mData path:\e[1;32m\t\t\t$main::config{DATA_DIR}\e[0m\n";
-	print "\e[0mLog path:\e[1;32m\t\t\t$main::config{LOG_DIR}\e[0m\n";
-	print "\e[0mModule path:\e[1;32m\t\t\t$main::config{MODULE_DIR}\e[0m\n";
-	print "\e[0mCompiler:\e[1;32m\t\t\t$main::cxx{NAME} $main::cxx{VERSION}\e[0m\n";
-	print "\e[0mSocket engine:\e[1;32m\t\t\t$main::config{SOCKETENGINE}\e[0m\n";
-	print "\e[0mGnuTLS support:\e[1;32m\t\t\t$main::config{USE_GNUTLS}\e[0m\n";
-	print "\e[0mOpenSSL support:\e[1;32m\t\t$main::config{USE_OPENSSL}\e[0m\n";
-}
-
 sub parse_templates($$) {

 	# These are actually hash references
@ -300,7 +295,7 @@ sub parse_templates($$) {
 			while ($line =~ /(@(\w+?)@)/) {
 				my ($variable, $name) = ($1, $2);
 				if (defined $settings{$name}) {
-					$line =~ s/$variable/$settings{$name}/;
+					$line =~ s/\Q$variable\E/$settings{$name}/;
 				} else {
 					print_warning "unknown template variable '$name' in $_!";
 					last;
--- a/make/template/main.mk
+++ b/make/template/main.mk
@ -43,6 +43,7 @@ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
 PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
 BASE = "$(DESTDIR)@BASE_DIR@"
 CONPATH = "$(DESTDIR)@CONFIG_DIR@"
+MANPATH = "$(DESTDIR)@MANUAL_DIR@"
 MODPATH = "$(DESTDIR)@MODULE_DIR@"
 DATPATH = "$(DESTDIR)@DATA_DIR@"
 BINPATH = "$(DESTDIR)@BINARY_DIR@"
@ -225,6 +226,7 @@ install: target
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
 	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
@IFNDEF PURE_STATIC
@ -238,10 +240,11 @@ install: target
@IFEQ $(SYSTEM) linux
 	-$(INSTALL) -m $(INSTMODE_LIB) inspircd.service $(BASE) 2>/dev/null
@ENDIF
-	-$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(BASE) 2>/dev/null
-	-$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(BASE) 2>/dev/null
+	-$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(MANPATH) 2>/dev/null
+	-$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(MANPATH) 2>/dev/null
 	-$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
 	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+	-$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH)
 	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
 	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
 	@echo ""
@ -273,8 +276,11 @@ clean:
 deinstall:
 	-rm -f $(BINPATH)/inspircd
 	-rm -rf $(CONPATH)/examples
+	-rm -f $(MANPATH)/inspircd.1
+	-rm -f $(MANPATH)/inspircd-genssl.1
 	-rm -f $(MODPATH)/*.so
 	-rm -f $(BASE)/.gdbargs
+	-rm -f $(BASE)/inspircd.service
 	-rm -f $(BASE)/org.inspircd.plist

 configureclean:
@ -283,6 +289,9 @@ configureclean:
 	rm -f GNUmakefile
 	rm -f include/config.h
 	rm -f inspircd
+	rm -f inspircd.1
+	rm -f inspircd-genssl.1
+	-rm -f inspircd.service
 	-rm -f org.inspircd.plist

 distclean: clean configureclean
--- a/make/template/org.inspircd.plist
+++ b/make/template/org.inspircd.plist
@ -23,6 +23,8 @@
 	<key>ServiceIPC</key>
 	<false/>
 	<key>UserName</key>
-	<string>ircdaemon</string>
+	<string>@USER@</string>
+	<key>GroupName</key>
+	<string>@GROUP@</string>
 </dict>
 </plist>
--- a/make/test/compiler.cpp
+++ b/make/test/compiler.cpp
@ -0,0 +1,29 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <iostream>
+#if defined _LIBCPP_VERSION
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+#endif
+
+int main() {
+	std::cout << "Hello, World!" << std::endl;
+	return 0;
+}