diff options
Diffstat (limited to 'Bugzilla/Install')
| -rw-r--r-- | Bugzilla/Install/Localconfig.pm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm index 263d63ced..f9363f1e9 100644 --- a/Bugzilla/Install/Localconfig.pm +++ b/Bugzilla/Install/Localconfig.pm @@ -40,10 +40,7 @@ our @EXPORT_OK = qw( sub _sensible_group { return '' if ON_WINDOWS; - my @groups = qw( apache www-data _www ); - my $sensible_group = first { return getgrnam($_) } @groups; - - return $sensible_group // getgrgid($EGID) // ''; + return scalar getgrgid($EGID); } use constant LOCALCONFIG_VARS => ( @@ -53,7 +50,7 @@ use constant LOCALCONFIG_VARS => ( }, { name => 'webservergroup', - default => ON_WINDOWS ? '' : 'apache', + default => \&_sensible_group, }, { name => 'use_suexec', @@ -297,7 +294,7 @@ sub update_localconfig { print colored(install_string('lc_new_vars', { localconfig => $filename, new_vars => wrap_hard($newstuff, 70) }), COLOR_ERROR), "\n"; - exit; + exit unless $params->{use_defaults}; } # Reset the cache for Bugzilla->localconfig so that it will be re-read |