]>
Commit | Line | Data |
---|---|---|
0e183c8f | 1 | --- bugzilla-2.22/Bugzilla/Config.pm 2006-04-23 05:45:09.000000000 +0300 |
5d6725e7 | 2 | +++ ./Config.pm 2006-04-24 02:50:00.901038343 +0300 |
0e183c8f ER |
3 | @@ -52,7 +52,7 @@ |
4 | # some point. | |
5 | ||
6 | # constant paths | |
7 | -our $libpath = '.'; | |
8 | +our $libpath = '/usr/share/bugzilla'; | |
9 | our $templatedir = "$libpath/template"; | |
10 | ||
11 | # variable paths | |
12 | @@ -64,8 +64,8 @@ | |
13 | $localconfig = "$libpath/localconfig.$project"; | |
14 | $datadir = "$libpath/data/$project"; | |
15 | } else { | |
16 | - $localconfig = "$libpath/localconfig"; | |
17 | - $datadir = "$libpath/data"; | |
18 | + $localconfig = "/etc/webapps/bugzilla/localconfig.pl"; | |
19 | + $datadir = "/var/lib/bugzilla/data"; | |
20 | } | |
21 | our $attachdir = "$datadir/attachments"; | |
22 | our $webdotdir = "$datadir/webdot"; | |
23 | @@ -147,7 +147,7 @@ | |
24 | my %params; | |
25 | ||
26 | # Load in the param definitions | |
27 | -foreach my $item ((glob "$libpath/Bugzilla/Config/*.pm")) { | |
28 | +foreach my $item ((glob "/usr/share/perl5/vendor_perl/Bugzilla/Config/*.pm")) { | |
29 | $item =~ m#/([^/]+)\.pm$#; | |
30 | my $module = $1; | |
31 | next if ($module eq 'Common'); | |
5d6725e7 ER |
32 | --- ./checksetup.pl 2006-04-24 22:03:58.576110738 +0300 |
33 | +++ ./checksetup.pl 2006-04-24 22:09:50.783963305 +0300 | |
0e183c8f ER |
34 | @@ -596,7 +596,7 @@ |
35 | ||
36 | my $webservergroup_default; | |
37 | if ($^O !~ /MSWin32/i) { | |
38 | - $webservergroup_default = 'apache'; | |
39 | + $webservergroup_default = 'http'; | |
40 | } else { | |
41 | $webservergroup_default = ''; | |
42 | } | |
43 | @@ -872,10 +872,10 @@ | |
44 | # a Bugzilla with the old data format, and upgrade their data files. | |
45 | ||
46 | # NB - the graphs dir isn't movable yet, unlike the datadir | |
47 | -unless (-d 'graphs') { | |
48 | +unless (-d '/var/lib/bugzilla/graphs') { | |
49 | print "Creating graphs directory...\n"; | |
50 | # permissions for non-webservergroup are fixed later on | |
51 | - mkdir 'graphs', 0770; | |
52 | + mkdir '/var/lib/bugzilla/graphs', 0770; | |
53 | # Upgrade data format | |
54 | foreach my $in_file (glob("$datadir/mining/*")) | |
55 | { | |
56 | @@ -965,13 +965,6 @@ | |
57 | mkdir "skins/custom", 0700; | |
58 | } | |
59 | ||
60 | -if (!-e "skins/.cvsignore") { | |
61 | - open CVSIGNORE, '>>', "skins/.cvsignore"; | |
62 | - print CVSIGNORE ".cvsignore\n"; | |
63 | - print CVSIGNORE "custom\n"; | |
64 | - close CVSIGNORE; | |
65 | -} | |
66 | - | |
67 | # Create custom stylesheets for each standard stylesheet. | |
68 | foreach my $standard (<skins/standard/*.css>) { | |
69 | my $custom = $standard; | |
70 | @@ -1368,8 +1361,6 @@ | |
71 | # chown needs to be called with a valid uid, not 0. $< returns the | |
72 | # caller's uid. Maybe there should be a $bugzillauid, and call | |
73 | # with that userid. | |
74 | - fixPerms('.htaccess', $<, $webservergid, 027); # glob('*') doesn't catch dotfiles | |
75 | - fixPerms("$datadir/.htaccess", $<, $webservergid, 027); | |
76 | fixPerms("$datadir/duplicates", $<, $webservergid, 027, 1); | |
77 | fixPerms("$datadir/mining", $<, $webservergid, 027, 1); | |
78 | fixPerms("$datadir/template", $<, $webservergid, 007, 1); # webserver will write to these | |
5d6725e7 | 79 | @@ -1377,21 +1368,11 @@ |
0e183c8f ER |
80 | fixPerms($webdotdir, $<, $webservergid, 007, 1); |
81 | fixPerms("$webdotdir/.htaccess", $<, $webservergid, 027); | |
82 | fixPerms("$datadir/params", $<, $webservergid, 017); | |
83 | - fixPerms('*', $<, $webservergid, 027); | |
84 | - fixPerms('Bugzilla', $<, $webservergid, 027, 1); | |
5d6725e7 | 85 | - fixPerms($templatedir, $<, $webservergid, 027, 1); |
0e183c8f ER |
86 | - fixPerms('images', $<, $webservergid, 027, 1); |
87 | - fixPerms('css', $<, $webservergid, 027, 1); | |
88 | - fixPerms('skins', $<, $webservergid, 027, 1); | |
89 | - fixPerms('js', $<, $webservergid, 027, 1); | |
5d6725e7 | 90 | - chmod 0644, 'globals.pl'; |
0e183c8f ER |
91 | |
92 | # Don't use fixPerms here, because it won't change perms | |
93 | # on the directory unless it's using recursion | |
5d6725e7 ER |
94 | - chown $<, $webservergid, $datadir; |
95 | - chmod 0771, $datadir; | |
0e183c8f ER |
96 | - chown $<, $webservergid, 'graphs'; |
97 | - chmod 0770, 'graphs'; | |
98 | + chown $<, $webservergid, '/var/lib/bugzilla/graphs'; | |
99 | + chmod 0770, '/var/lib/bugzilla/graphs'; | |
100 | } else { | |
101 | # get current gid from $( list | |
102 | my $gid = (split " ", $()[0]; | |
5d6725e7 | 103 | @@ -1416,8 +1397,8 @@ |
0e183c8f ER |
104 | # on the directory unless it's using recursion |
105 | chown $<, $gid, $datadir; | |
106 | chmod 0777, $datadir; | |
107 | - chown $<, $gid, 'graphs'; | |
108 | - chmod 01777, 'graphs'; | |
109 | + chown $<, $gid, '/var/lib/bugzilla/graphs'; | |
110 | + chmod 01777, '/var/lib/bugzilla/graphs'; | |
111 | } | |
112 | } | |
113 | ||
114 | --- a/collectstats.pl~ 2004-11-28 19:12:51.000000000 +0200 | |
115 | +++ a/collectstats.pl 2005-01-21 08:57:30.975582527 +0200 | |
116 | @@ -48,7 +48,7 @@ | |
117 | if (chdir("graphs")) { | |
118 | unlink <./*.gif>; | |
119 | unlink <./*.png>; | |
120 | - chdir(".."); | |
121 | + chdir("/usr/share/bugzilla"); | |
122 | } | |
123 | ||
124 | GetVersionTable(); | |
5d6725e7 ER |
125 | --- ./checksetup.pl 2006-04-24 22:03:58.576110738 +0300 |
126 | +++ ./checksetup.pl 2006-04-24 22:09:50.783963305 +0300 | |
3e6538dd ER |
127 | @@ -659,7 +659,7 @@ |
128 | # <Directory> blocks.) | |
129 | # If this is set to 1, Bugzilla will create these files if they don't exist. | |
130 | # If this is set to 0, Bugzilla will not create these files. | |
131 | -$create_htaccess = 1; | |
132 | +$create_htaccess = 0; | |
133 | END | |
134 | ||
135 | my $webservergroup_default; |