Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
a8512cea
Commit
a8512cea
authored
Jan 27, 2016
by
Dylan Hardison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 1241026 - checksetup.pl requires editing localconfig to remove apache group
r=dkl,a=dylan
parent
a0f345b3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
Localconfig.pm
Bugzilla/Install/Localconfig.pm
+12
-1
No files found.
Bugzilla/Install/Localconfig.pm
View file @
a8512cea
...
@@ -25,6 +25,8 @@ use Bugzilla::Util qw(generate_random_password wrap_hard);
...
@@ -25,6 +25,8 @@ use Bugzilla::Util qw(generate_random_password wrap_hard);
use
Data::
Dumper
;
use
Data::
Dumper
;
use
File::
Basename
qw(dirname)
;
use
File::
Basename
qw(dirname)
;
use
English
qw($EGID)
;
use
List::
Util
qw(first)
;
use
Safe
;
use
Safe
;
use
Term::
ANSIColor
;
use
Term::
ANSIColor
;
...
@@ -35,6 +37,14 @@ our @EXPORT_OK = qw(
...
@@ -35,6 +37,14 @@ our @EXPORT_OK = qw(
update_localconfig
update_localconfig
)
;
)
;
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
)
//
''
;
}
use
constant
LOCALCONFIG_VARS
=>
(
use
constant
LOCALCONFIG_VARS
=>
(
{
{
name
=>
'create_htaccess'
,
name
=>
'create_htaccess'
,
...
@@ -42,7 +52,7 @@ use constant LOCALCONFIG_VARS => (
...
@@ -42,7 +52,7 @@ use constant LOCALCONFIG_VARS => (
},
},
{
{
name
=>
'webservergroup'
,
name
=>
'webservergroup'
,
default
=>
ON_WINDOWS
?
''
:
'apache'
,
default
=>
_sensible_group
()
,
},
},
{
{
name
=>
'use_suexec'
,
name
=>
'use_suexec'
,
...
@@ -124,6 +134,7 @@ use constant LOCALCONFIG_VARS => (
...
@@ -124,6 +134,7 @@ use constant LOCALCONFIG_VARS => (
},
},
);
);
sub
read_localconfig
{
sub
read_localconfig
{
my
(
$include_deprecated
)
=
@_
;
my
(
$include_deprecated
)
=
@_
;
my
$filename
=
bz_locations
()
->
{
'localconfig'
};
my
$filename
=
bz_locations
()
->
{
'localconfig'
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment