Skip to content
Browse files

unhook --uid from --system in configure script

Specifying --uid allows the ircd to run as a specific user, while
--system fixes the install directories to be spread all over the system.
Specifying --uid shouldn't imply --system. This fix allows a uid to be set
while not interfering with --prefix
  • Loading branch information...
1 parent a4db7bf commit 98b4025af9bbbb40cf74552016972247605e0e1e Steven Van Acker committed Nov 15, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 configure
View
6 configure
@@ -152,11 +152,11 @@ $config{BASE_DIR} = $config{ME}."/run";
if (defined $opt_base_dir) {
$config{BASE_DIR} = $opt_base_dir;
-} elsif (defined $opt_system || defined $opt_uid) {
+} elsif (defined $opt_system) {
$config{BASE_DIR} = '/var/lib/inspircd';
}
-if (defined $opt_system || defined $opt_uid) {
+if (defined $opt_system) {
$config{UID} = $opt_uid || 'ircd';
$config{CONFIG_DIR} = '/etc/inspircd';
$config{MODULE_DIR} = '/usr/lib/inspircd';
@@ -165,7 +165,7 @@ if (defined $opt_system || defined $opt_uid) {
$config{DATA_DIR} = '/var/inspircd';
$config{LOG_DIR} = '/var/log/inspircd';
} else {
- $config{UID} = $<;
+ $config{UID} = $opt_uid || $<;
$config{CONFIG_DIR} = resolve_directory($config{BASE_DIR}."/conf"); # Configuration Directory
$config{MODULE_DIR} = resolve_directory($config{BASE_DIR}."/modules"); # Modules Directory
$config{BINARY_DIR} = resolve_directory($config{BASE_DIR}."/bin"); # Binary Directory

0 comments on commit 98b4025

Please sign in to comment.
Something went wrong with that request. Please try again.