On 26/03/12 14:49 -0400, Matt Wagner wrote:
---
recipes/aeolus/files/aggregator-httpd-ssl.conf | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
Maybe there was another patch I didnt see, but what about the file in
conductor? conf/aeolus-conductor-httpd.conf
Oh, and hmm, looking at configure src, there is a simiar file to what
you changed, but minus ssl. Seems to me like at least one (if not
more) of these 3 shoudl go away, and all remaining should be fixed.
And those ancient names should be fixed, I can believe there are any
refs to aggregator anymore, insane! (That doesnt have to be in this
atchset, but I suspect if it isn't we'll forget for another couple
years...) Just did quick search, and these look like the offending
references:
../aeolus-configure/pkg/aeolus-configure-2.6.0/recipes/aeolus/manifests/conductor.pp:
apache::site{"aeolus-conductor": source =>
'puppet:///modules/aeolus/aggregator-httpd-ssl.conf'}
../aeolus-configure/pkg/aeolus-configure-2.6.0/recipes/aeolus/manifests/conductor.pp:
apache::site{"aeolus-conductor": source =>
'puppet:///modules/aeolus/aggregator-httpd.conf'}
../aeolus-configure/recipes/aeolus/manifests/conductor.pp:
apache::site{"aeolus-conductor": source =>
'puppet:///modules/aeolus/aggregator-httpd-ssl.conf'}
../aeolus-configure/recipes/aeolus/manifests/conductor.pp:
apache::site{"aeolus-conductor": source =>
'puppet:///modules/aeolus/aggregator-httpd.conf'}
-j
diff --git a/recipes/aeolus/files/aggregator-httpd-ssl.conf
b/recipes/aeolus/files/aggregator-httpd-ssl.conf
index 47f5aa0..2f565b2 100644
--- a/recipes/aeolus/files/aggregator-httpd-ssl.conf
+++ b/recipes/aeolus/files/aggregator-httpd-ssl.conf
@@ -16,11 +16,13 @@ NameVirtualHost *:443
Timeout 5400
ProxyTimeout 5400
+AddType application/x-woff .woff
+
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]
@@ -29,17 +31,24 @@ ExpiresByType text/css "access plus 1 year"
ExpiresByType text/javascript "access plus 1 year"
ExpiresByType application/javascript "access plus 1 year"
ExpiresByType image/png "access plus 1 year"
+# Web fonts (.eot, .ttf, .svg, .woff, respectively):
+ExpiresByType application/vnd.ms-fontobject "access plus 1 year"
+ExpiresByType application/x-font-ttf "access plus 1 year"
+ExpiresByType image/svg+xml "access plus 1 year"
+ExpiresByType application/x-woff "access plus 1 year"
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