From e3e2c7c0273499f832ee692ca63620cd8aa8bda1 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Mon, 3 Jul 2017 12:09:44 -0700 Subject: Bug 1361439 - Create dockerflow-compliant container that runs a BMO web head --- Bugzilla/Install/Localconfig.pm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Bugzilla') 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 -- cgit v1.2.3-24-g4f1b