From 7f29dd34a78737967912f7c7156451facde7051d Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Thu, 22 May 2014 13:57:28 +0800 Subject: Bug 1014374: backport bug 977969 to bmo (concatenate and slightly minify css files) --- Bugzilla/Install/Filesystem.pm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Bugzilla/Install/Filesystem.pm') diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index cd1e76916..5ea0917fa 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -211,6 +211,8 @@ sub FILESYSTEM { dirs => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE }, "$datadir/db" => { files => CGI_WRITE, dirs => DIR_CGI_WRITE }, + "$skinsdir/assets" => { files => WS_SERVE, + dirs => DIR_CGI_OVERWRITE | DIR_ALSO_WS_SERVE }, # Readable directories "$datadir/mining" => { files => CGI_READ, @@ -284,6 +286,7 @@ sub FILESYSTEM { $attachdir => DIR_CGI_WRITE, $graphsdir => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE, $webdotdir => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE, + "$skinsdir/assets" => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE, # Directories that contain content served directly by the web server. "$skinsdir/custom" => DIR_WS_SERVE, "$skinsdir/contrib" => DIR_WS_SERVE, @@ -483,6 +486,7 @@ EOT _remove_empty_css_files(); _convert_single_file_skins(); + _remove_dynamic_css_files(); } sub _remove_empty_css_files { @@ -527,6 +531,14 @@ sub _convert_single_file_skins { } } +# delete all automatically generated css files to force recreation at the next +# request. +sub _remove_dynamic_css_files { + foreach my $file (glob(bz_locations()->{skinsdir} . '/assets/*.css')) { + unlink($file); + } +} + sub create_htaccess { _create_files(%{FILESYSTEM()->{htaccess}}); -- cgit v1.2.3-24-g4f1b