On 08/13/2012 04:25 PM, Matt Wagner wrote:
On Mon, Aug 13, 2012 at 04:11:32PM +0200, [email protected] wrote:
From: Jiri Tomasek <[email protected]>
---
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>
--
1.7.7.6
ACK and pushed to master. This fixes an annoying issue.
This isn't an issue with your patch, hence the ACK and push, but I
really can't understand why we are using aeolus-configure for this at
all. Shouldn't aeolus-conductor set up its own Apache config? It's not
as if we're using puppet to write out some dynamic values depending on
what options are passed to aeolus-configure. Is there an argument that
we should keep aeolus-configure doing this, or should I throw a task on
the backlog to shift this responsibility over to Conductor itself?
-- Matt
I am not really sure where this should be done (aeolus vs configure) but
I noticed we already have conf/aeolus-conductor-httpd.conf which is not
used at the moment.
I agree on having it part of conductor if there is no other reason to
have it in configure.
Jirka
