From 7c4f9e6b94793caf3c9369cc0519eefddc54f7d0 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 16 Nov 2012 19:15:14 +0200
Subject: [PATCH] Removed puppet file shares from puppet-httpd.conf

---
 puppet/templates/puppet-httpd.conf.erb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/puppet/templates/puppet-httpd.conf.erb b/puppet/templates/puppet-httpd.conf.erb
index f75c9a0..ec03354 100644
--- a/puppet/templates/puppet-httpd.conf.erb
+++ b/puppet/templates/puppet-httpd.conf.erb
@@ -50,12 +50,7 @@ Listen 8140
 
   # Proxy settings
   <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>
@@ -67,4 +62,3 @@ Listen 8140
   SetEnv proxy-nokeepalive 1
 
 </VirtualHost>
-