[PATCH aeolus-configure] RM3523 Fixed fonts config in httpd conf

[Jirka Tomasek]

This patch implements one of RM3523 Quickfixes: Added correct fonts configuration to httpd conf in aeolus-configure

[PATCH] Added correct fonts alias and ProxyPass/ProxiPassReverse fonts to httpd conf

[Jirka Tomasek]

From: Jiri Tomasek

---
 recipes/aeolus/templates/aggregator-httpd-ssl.conf |    4 +++-
 recipes/aeolus/templates/aggregator-httpd.conf     |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/recipes/aeolus/templates/aggregator-httpd-ssl.conf b/recipes/aeolus/templates/aggregator-httpd-ssl.conf
index dc784cb..59fb65b 100644
--- a/recipes/aeolus/templates/aggregator-httpd-ssl.conf
+++ b/recipes/aeolus/templates/aggregator-httpd-ssl.conf
@@ -23,7 +23,7 @@ Alias /conductor/stylesheets "/usr/share/aeolus-conductor/public/stylesheets"
 Alias /conductor/graphics "/usr/share/aeolus-conductor/public/images"
 Alias /conductor/errors "/usr/share/aeolus-conductor/public/errors"
 Alias /conductor/javascripts "/usr/share/aeolus-conductor/public/javascripts"
-Alias /fonts "/usr/share/aeolus-conductor/public/fonts"
+Alias /conductor/fonts "/usr/share/aeolus-conductor/public/fonts"

RewriteRule ^/conductor/images/(.*).(png|jpg|gif|svg)$ /conductor/graphics/$1.$2 [R]

@@ -37,12 +37,14 @@ ProxyPass /conductor/graphics !
 ProxyPass /conductor/stylesheets !
 ProxyPass /conductor/errors !
 ProxyPass /conductor/javascripts !
+ProxyPass /conductor/fonts !
 ProxyPass /conductor http://localhost:3000/conductor
 ProxyPassReverse /conductor http://localhost:3000/conductor
 ProxyPassReverse /conductor/graphics !
 ProxyPassReverse /conductor/stylesheets !
 ProxyPassReverse /conductor/errors !
 ProxyPassReverse /conductor/javascripts !
+ProxyPassReverse /conductor/fonts !

</VirtualHost>

diff --git a/recipes/aeolus/templates/aggregator-httpd.conf b/recipes/aeolus/templates/aggregator-httpd.conf
index 8c96158..fb55d9e 100644
--- a/recipes/aeolus/templates/aggregator-httpd.conf
+++ b/recipes/aeolus/templates/aggregator-httpd.conf
@@ -18,7 +18,7 @@ Alias /conductor/stylesheets "/usr/share/aeolus-conductor/public/stylesheets"
 Alias /conductor/graphics "/usr/share/aeolus-conductor/public/images"
 Alias /conductor/errors "/usr/share/aeolus-conductor/public/errors"
 Alias /conductor/javascripts "/usr/share/aeolus-conductor/public/javascripts"
-Alias /fonts "/usr/share/aeolus-conductor/public/fonts"
+Alias /conductor/fonts "/usr/share/aeolus-conductor/public/fonts"

RewriteRule ^/conductor/images/(.*).(png|jpg|gif|svg)$ /conductor/graphics/$1.$2 [R]

@@ -32,11 +32,13 @@ ProxyPass /conductor/graphics !
 ProxyPass /conductor/stylesheets !
 ProxyPass /conductor/errors !
 ProxyPass /conductor/javascripts !
+ProxyPass /conductor/fonts !
 ProxyPass /conductor http://localhost:3000/conductor
 ProxyPassReverse /conductor http://localhost:3000/conductor
 ProxyPassReverse /conductor/graphics !
 ProxyPassReverse /conductor/stylesheets !
 ProxyPassReverse /conductor/errors !
 ProxyPassReverse /conductor/javascripts !
+ProxyPassReverse /conductor/fonts !

</VirtualHost>