Merge remote-tracking branch 'upstream/1.3' into 1.3

# Conflicts: # composer.json
ezsystems · Sep 13, 2016 · 3b94bb9 · 3b94bb9
2 parents 0dfbbeb + 617876d
commit 3b94bb9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/doc/apache2/Readme.md b/doc/apache2/Readme.md
@@ -78,7 +78,7 @@ Example config for Apache 2.4 in prefork mode:
         # Additional Assetic rules for environments different from dev,
         # remember to run php app/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
-        RewriteRule ^/(css|js|font)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
+        RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 
         RewriteRule .* /app.php
     </VirtualHost>
@@ -125,7 +125,7 @@ If you do not have an access to use virtualhost config, use the `.htaccess` file
     # Additional Assetic rules for prod environments
     # ! Remember to run php ezpublish/console assetic:dump --env=prod on changes
     # ! Or if SYMFONY_ENV is set to "dev", comment this out!
-    RewriteRule ^(css|js|font)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
+    RewriteRule ^(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 
     # Rewrite all other queries to the front controller.
     RewriteRule .* app.php

diff --git a/doc/apache2/vhost.template b/doc/apache2/vhost.template
@@ -100,7 +100,7 @@
         # Additional Assetic rules for environments different from dev,
         # remember to run php app/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
-        RewriteRule ^/(css|js|font)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
+        RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 
         RewriteRule .* /app.php
     </IfModule>

diff --git a/doc/nginx/ez_params.d/ez_prod_rewrite_params b/doc/nginx/ez_params.d/ez_prod_rewrite_params
@@ -4,9 +4,8 @@
 ## and make sure to comment these out in DEV environment.
 rewrite "^/css/(.*)\.css" "/css/$1.css" break;
 rewrite "^/js/(.*)\.js" "/js/$1.js" break;
-rewrite "^/font/(.*)\.ttf" "/font/$1.ttf" break;
-rewrite "^/font/(.*)\.woff" "/font/$1.woff" break;
-rewrite "^/font/(.*)\.otf" "/font/$1.otf" break;
-rewrite "^/font/(.*)\.eot" "/font/$1.eot" break;
-rewrite "^/font/(.*)\.svg" "/font/$1.svg" break;
-
+rewrite "^/fonts?/(.*)\.ttf" "/font$1/$2.ttf" break;
+rewrite "^/fonts?/(.*)\.woff" "/font$1/$2.woff" break;
+rewrite "^/fonts?/(.*)\.otf" "/font$1/$2.otf" break;
+rewrite "^/fonts?/(.*)\.eot" "/font$1/$2.eot" break;
+rewrite "^/fonts?/(.*)\.svg" "/font$1/$2.svg" break;