/[packages]/updates/3/bugzilla/current/SOURCES/bugzilla-fhs.patch
ViewVC logotype

Diff of /updates/3/bugzilla/current/SOURCES/bugzilla-fhs.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 619078 by umeabot, Tue May 21 22:25:58 2013 UTC revision 619079 by tmb, Wed Apr 30 21:25:23 2014 UTC
# Line 1  Line 1 
1  diff -ru bugzilla-4.2-orig/Bugzilla/Constants.pm bugzilla-4.2/Bugzilla/Constants.pm  diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
2  --- bugzilla-4.2-orig/Bugzilla/Constants.pm     2012-02-22 21:37:03.000000000 +0100  index 1682228..d7088c2 100644
3  +++ bugzilla-4.2/Bugzilla/Constants.pm  2012-02-25 17:30:15.300985954 +0100  --- a/Bugzilla/Constants.pm
4  @@ -602,38 +602,34 @@  +++ b/Bugzilla/Constants.pm
5    @@ -610,39 +610,35 @@ sub _bz_locations {
6       #       #
7       # On mod_cgi this will be a relative path. On mod_perl it will be an       # On mod_cgi this will be a relative path. On mod_perl it will be an
8       # absolute path.       # absolute path.
# Line 11  diff -ru bugzilla-4.2-orig/Bugzilla/Cons Line 12  diff -ru bugzilla-4.2-orig/Bugzilla/Cons
12  -    $libpath = $1;  -    $libpath = $1;
13  +    my $basepath = '/usr/share/bugzilla';  +    my $basepath = '/usr/share/bugzilla';
14    
15       my ($project, $localconfig, $datadir);       my ($localconfig, $datadir);
16       if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {       if ($project && $project =~ /^(\w+)$/) {
17           $project = $1;           $project = $1;
18  -        $localconfig = "localconfig.$project";  -        $localconfig = "localconfig.$project";
19  -        $datadir = "data/$project";  -        $datadir = "data/$project";
20  +        $localconfig = "/etc/bugzilla/localconfig.$project";  +        $localconfig = "/etc/bugzilla/localconfig.$project";
21  +        $datadir = "/var/lib/bugzilla/$project";  +        $datadir = "/var/lib/bugzilla/$project";
22       } else {       } else {
23             $project = undef;
24  -        $localconfig = "localconfig";  -        $localconfig = "localconfig";
25  -        $datadir = "data";  -        $datadir = "data";
26  +        $localconfig = "/etc/bugzilla/localconfig";  +        $localconfig = "/etc/bugzilla/localconfig";
# Line 48  diff -ru bugzilla-4.2-orig/Bugzilla/Cons Line 50  diff -ru bugzilla-4.2-orig/Bugzilla/Cons
50           'attachdir'   => "$datadir/attachments",           'attachdir'   => "$datadir/attachments",
51  -        'skinsdir'    => "$libpath/skins",  -        'skinsdir'    => "$libpath/skins",
52  -        'graphsdir'   => "$libpath/graphs",  -        'graphsdir'   => "$libpath/graphs",
53  +        'skinsdir'    => "$basepath/www/skins",  +       'skinsdir'    => "$basepath/www/skins",
54  +        'graphsdir'   => "$datadir/graphs",  +       'graphsdir'   => "$datadir/graphs",
55           # $webdotdir must be in the web server's tree somewhere. Even if you use a           # $webdotdir must be in the web server's tree somewhere. Even if you use a
56           # local dot, we output images to there. Also, if $webdotdir is           # local dot, we output images to there. Also, if $webdotdir is
57           # not relative to the bugzilla root directory, you'll need to           # not relative to the bugzilla root directory, you'll need to
58  @@ -641,7 +637,7 @@  @@ -650,7 +646,7 @@ sub _bz_locations {
59           # location.           # location.
60           # The script should really generate these graphs directly...           # The script should really generate these graphs directly...
61           'webdotdir'   => "$datadir/webdot",           'webdotdir'   => "$datadir/webdot",
# Line 62  diff -ru bugzilla-4.2-orig/Bugzilla/Cons Line 64  diff -ru bugzilla-4.2-orig/Bugzilla/Cons
64       };       };
65   }   }
66    
67  Only in bugzilla-4.2/Bugzilla: Constants.pm~  diff --git a/checksetup.pl b/checksetup.pl
68  diff -ru bugzilla-4.2-orig/checksetup.pl bugzilla-4.2/checksetup.pl  index bcc1ad8..4b55bf6 100755
69  --- bugzilla-4.2-orig/checksetup.pl     2012-02-22 21:37:03.000000000 +0100  --- a/checksetup.pl
70  +++ bugzilla-4.2/checksetup.pl  2012-02-22 23:08:46.620225264 +0100  +++ b/checksetup.pl
71  @@ -49,8 +49,7 @@  @@ -19,8 +19,7 @@ use Getopt::Long qw(:config bundling);
72   use Pod::Usage;   use Pod::Usage;
73   use Safe;   use Safe;
74    
# Line 76  diff -ru bugzilla-4.2-orig/checksetup.pl Line 78  diff -ru bugzilla-4.2-orig/checksetup.pl
78   use Bugzilla::Constants;   use Bugzilla::Constants;
79   use Bugzilla::Install::Requirements;   use Bugzilla::Install::Requirements;
80   use Bugzilla::Install::Util qw(install_string get_version_and_os   use Bugzilla::Install::Util qw(install_string get_version_and_os
 Only in bugzilla-4.2/: checksetup.pl~  

Legend:
Removed from v.619078  
changed lines
  Added in v.619079

  ViewVC Help
Powered by ViewVC 1.1.30