tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed puppetmaster apache to serve files internally instead proxying requests to puppetmaster process.

Browse source
This commit is contained in:
Timo Mkinen 2011-08-11 16:01:44 +03:00
parent c1af3ee920
commit 2771ac24e7
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
puppet/templates/puppet-httpd.conf.erb
View file

@ -49,7 +49,18 @@ Listen 8140
RequestHeader set X-Client-Verify %{SSL_CLIENT_VERIFY}e
# Proxy settings
ProxyPass / balancer://puppetmaster:8140/ timeout=180
<IfModule mod_rewrite.c>
<LocationMatch ^/production/file_content/.*>
ForceType application/x-raw
</LocationMatch>
RewriteEngine On
RewriteRule ^/production/file_content/files/(.+)$ /srv/puppet/files/common/$1 [L]
RewriteRule ^/production/file_content/modules/([^/]+)/files/(.+)$ /etc/puppet/modules/$1/files/$2 [L]
RewriteRule ^/(.*)$ balancer://puppetmaster%{REQUEST_URI} [P,QSA,L]
</Ifmodule>
<IfModule !mod_rewrite.c>
ProxyPass / balancer://puppetmaster:8140/ timeout=180
</IfModule>
ProxyPassReverse / balancer://puppetmaster:8140/
ProxyPreserveHost on
SetEnv force-proxy-request-1.0 1