Merge branch 'master' into unstable

1 files changed, 11 insertions, 0 deletions

diff --git a/checksetup.pl b/checksetup.pl
index 6cea8549d..d3f08e024 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -30,6 +30,7 @@ use Pod::Usage;
 # Bug 1270550 - Tie::Hash::NamedCapture must be loaded before Safe.
 use Tie::Hash::NamedCapture;
 use Safe;
+use English qw(-no_match_vars $EUID $EGID);
 
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;
@@ -155,6 +156,16 @@ unless ($ENV{LOCALCONFIG_ENV}) {
 }
 my $lc_hash = Bugzilla->localconfig;
 
+if ( $EUID == 0 && $lc_hash->{webservergroup} && !ON_WINDOWS ) {
+    # So checksetup was run as root, and we have a webserver group set.
+    # Let's assume the user wants us to make files that are writable
+    # by the webserver group.
+
+    $EGID = getgrnam $lc_hash->{webservergroup}; ## no critic (Variables::RequireLocalizedPunctuationVars)
+    umask 002
+        or die "failed to set umask 002: $!";
+}
+
 unless ($switch{'no-database'}) {
     die "urlbase is not set\n" unless $lc_hash->{urlbase};
     die "urlbase must end with slash\n" unless $lc_hash->{urlbase} =~ m{/$}ms;