]>
Commit | Line | Data |
---|---|---|
50515e04 ER |
1 | --- a/collectstats.pl 2005-01-21 08:57:30.975582527 +0200 |
2 | +++ a/collectstats.pl 2006-04-24 23:04:25.847159729 +0300 | |
0e183c8f ER |
3 | @@ -48,7 +48,7 @@ |
4 | if (chdir("graphs")) { | |
5 | unlink <./*.gif>; | |
6 | unlink <./*.png>; | |
7 | - chdir(".."); | |
8 | + chdir("/usr/share/bugzilla"); | |
9 | } | |
10 | ||
11 | GetVersionTable(); | |
50515e04 ER |
12 | @@ -96,8 +96,8 @@ |
13 | trick_taint($perl); | |
14 | ||
15 | # Generate a static RDF file containing the default view of the duplicates data. | |
16 | - open(CGI, "$perl -T duplicates.cgi |") | |
17 | - || die "can't fork duplicates.cgi: $!"; | |
18 | + open(CGI, "$perl -T htdocs/duplicates.cgi |") | |
19 | + || die "can't fork htdocs/duplicates.cgi: $!"; | |
20 | open(RDF, ">$datadir/duplicates.tmp") | |
21 | || die "can't write to $datadir/duplicates.tmp: $!"; | |
22 | my $headers_done = 0; | |
092444e9 ER |
23 | --- bugzilla-3.0/Bugzilla/Constants.pm~ 2007-05-10 01:47:17.000000000 +0300 |
24 | +++ bugzilla-3.0/Bugzilla/Constants.pm 2007-06-21 23:57:48.044744852 +0300 | |
25 | @@ -407,10 +407,10 @@ | |
26 | my ($project, $localconfig, $datadir); | |
27 | if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) { | |
28 | $project = $1; | |
29 | - $localconfig = "localconfig.$project"; | |
30 | + $localconfig = "localconfig.$project.pl"; | |
31 | $datadir = "data/$project"; | |
32 | } else { | |
33 | - $localconfig = "localconfig"; | |
34 | + $localconfig = "localconfig.pl"; | |
35 | $datadir = "data"; | |
36 | } | |
37 | ||
38 | @@ -420,13 +420,13 @@ | |
39 | 'libpath' => $libpath, | |
40 | # If you put the libraries in a different location than the CGIs, | |
41 | # make sure this still points to the CGIs. | |
42 | - 'cgi_path' => $libpath, | |
43 | - 'templatedir' => "$libpath/template", | |
44 | + 'cgi_path' => '/usr/share/bugzilla/htdocs', | |
45 | + 'templatedir' => "/usr/share/bugzilla/template", | |
46 | 'project' => $project, | |
47 | - 'localconfig' => "$libpath/$localconfig", | |
48 | - 'datadir' => "$libpath/$datadir", | |
49 | - 'attachdir' => "$libpath/$datadir/attachments", | |
5a8a65f4 | 50 | - 'skinsdir' => "$libpath/skins", |
092444e9 ER |
51 | + 'localconfig' => "/etc/webapps/bugzilla/$localconfig", |
52 | + 'datadir' => "/var/lib/bugzilla/$datadir", | |
53 | + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", | |
5a8a65f4 | 54 | + 'skinsdir' => "/usr/share/bugzilla/htdocs/skins", |
092444e9 ER |
55 | # $webdotdir must be in the webtree somewhere. Even if you use a |
56 | # local dot, we output images to there. Also, if $webdotdir is | |
57 | # not relative to the bugzilla root directory, you'll need to | |
5e012dbb ER |
58 | --- bugzilla-3.0/Bugzilla/Install/Filesystem.pm 2006-12-09 13:58:14.000000000 +0200 |
59 | +++ bugzilla-3.0/Bugzilla/Install/Filesystem.pm 2007-06-22 00:08:36.399403065 +0300 | |
60 | @@ -99,21 +99,6 @@ | |
61 | ||
62 | # --- FILE PERMISSIONS (Non-created files) --- # | |
63 | my %files = ( | |
64 | - '*' => { perms => $ws_readable }, | |
65 | - '*.cgi' => { perms => $ws_executable }, | |
66 | - 'whineatnews.pl' => { perms => $ws_executable }, | |
67 | - 'collectstats.pl' => { perms => $ws_executable }, | |
68 | - 'checksetup.pl' => { perms => $owner_executable }, | |
69 | - 'importxml.pl' => { perms => $ws_executable }, | |
70 | - 'runtests.pl' => { perms => $owner_executable }, | |
71 | - 'testserver.pl' => { perms => $ws_executable }, | |
72 | - 'whine.pl' => { perms => $ws_executable }, | |
73 | - 'customfield.pl' => { perms => $owner_executable }, | |
74 | - 'email_in.pl' => { perms => $ws_executable }, | |
75 | - | |
76 | - 'docs/makedocs.pl' => { perms => $owner_executable }, | |
77 | - 'docs/rel_notes.txt' => { perms => $ws_readable }, | |
78 | - 'docs/README.docs' => { perms => $owner_readable }, | |
79 | "$datadir/bugzilla-update.xml" => { perms => $ws_writeable }, | |
80 | "$datadir/params" => { perms => $ws_writeable }, | |
81 | "$datadir/mailer.testfile" => { perms => $ws_writeable }, | |
82 | @@ -123,8 +108,6 @@ | |
83 | # recurse through. These are directories we didn't create | |
84 | # in checkesetup.pl. | |
85 | my %non_recurse_dirs = ( | |
86 | - '.' => $ws_dir_readable, | |
87 | - docs => $ws_dir_readable, | |
88 | ); | |
89 | ||
90 | # This sets the permissions for each item inside each of these | |
1a846dd1 | 91 | @@ -138,29 +121,13 @@ |
5e012dbb ER |
92 | $attachdir => { files => $ws_writeable, |
93 | dirs => $ws_dir_writeable }, | |
94 | $webdotdir => { files => $ws_writeable, | |
95 | dirs => $ws_dir_writeable }, | |
96 | - graphs => { files => $ws_writeable, | |
97 | - dirs => $ws_dir_writeable }, | |
98 | ||
99 | # Readable directories | |
100 | "$datadir/mining" => { files => $ws_readable, | |
101 | dirs => $ws_dir_readable }, | |
102 | "$datadir/duplicates" => { files => $ws_readable, | |
103 | dirs => $ws_dir_readable }, | |
104 | - "$libdir/Bugzilla" => { files => $ws_readable, | |
105 | - dirs => $ws_dir_readable }, | |
106 | - $templatedir => { files => $ws_readable, | |
107 | - dirs => $ws_dir_readable }, | |
108 | - images => { files => $ws_readable, | |
109 | - dirs => $ws_dir_readable }, | |
110 | - css => { files => $ws_readable, | |
111 | - dirs => $ws_dir_readable }, | |
112 | - js => { files => $ws_readable, | |
113 | - dirs => $ws_dir_readable }, | |
114 | - skins => { files => $ws_readable, | |
115 | - dirs => $ws_dir_readable }, | |
116 | - t => { files => $owner_readable, | |
117 | - dirs => $owner_dir_readable }, | |
118 | 'docs/html' => { files => $ws_readable, | |
119 | dirs => $ws_dir_readable }, | |
120 | 'docs/pdf' => { files => $ws_readable, | |
1a846dd1 | 121 | @@ -186,7 +153,7 @@ |
5e012dbb ER |
122 | "$datadir/duplicates" => $ws_dir_readable, |
123 | $attachdir => $ws_dir_writeable, | |
124 | $extensionsdir => $ws_dir_readable, | |
125 | - graphs => $ws_dir_writeable, | |
126 | + "$datadir/graphs" => $ws_dir_writeable, | |
127 | $webdotdir => $ws_dir_writeable, | |
128 | 'skins/custom' => $ws_dir_readable, | |
129 | 'skins/contrib' => $ws_dir_readable, |