summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-10-17 18:02:42 +0200
committerDave Lawrence <dlawrence@mozilla.com>2013-10-17 18:02:42 +0200
commit27d7fc49f8b9fe52cb94fda227ff3a0937d497f3 (patch)
tree0571fb266d0b0c619d9be2a8c2272d04afcce9a1
parenta15e9311146867b4decacee483f0074d93bf7661 (diff)
downloadbugzilla-27d7fc49f8b9fe52cb94fda227ff3a0937d497f3.tar.gz
bugzilla-27d7fc49f8b9fe52cb94fda227ff3a0937d497f3.tar.xz
Revert for now Bug 887117 - Move the compiled template cache dir to a directory in the document root to avoid storing on NFS
-rw-r--r--.htaccess1
-rw-r--r--Bugzilla/Constants.pm2
-rw-r--r--Bugzilla/Install/Filesystem.pm1
3 files changed, 1 insertions, 3 deletions
diff --git a/.htaccess b/.htaccess
index 6bdc450f8..e6b7e14ea 100644
--- a/.htaccess
+++ b/.htaccess
@@ -41,7 +41,6 @@ Redirect permanent /etiquette.html https://bugzilla.mozilla.org/page.cgi?id=etiq
Redirect permanent /duplicates.html https://bugzilla.mozilla.org/duplicates.cgi
RewriteEngine On
-RewriteRule ^template_cache/ - [F,L,NC]
RewriteRule ^review(.*) page.cgi?id=splinter.html$1 [QSA]
RewriteRule ^user_?profile(.*) page.cgi?id=user_profile.html$1 [QSA]
RewriteRule ^favicon\.ico$ extensions/BMO/web/images/favicon.ico
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index bfc734088..ef3afeccb 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -650,7 +650,7 @@ sub bz_locations {
# make sure this still points to the CGIs.
'cgi_path' => $libpath,
'templatedir' => "$libpath/template",
- 'template_cache' => "$libpath/template_cache",
+ 'template_cache' => "$datadir/template",
'project' => $project,
'localconfig' => "$libpath/$localconfig",
'datadir' => $datadir,
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 21f07f2d5..1abac0154 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -281,7 +281,6 @@ sub FILESYSTEM {
# Directories that cgi scripts can write to.
"$datadir/db" => DIR_CGI_WRITE,
$attachdir => DIR_CGI_WRITE,
- $template_cache => DIR_CGI_WRITE,
$graphsdir => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE,
$webdotdir => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE,
# Directories that contain content served directly by the web server.