Fix the auth stanza

Sutto · Apr 26, 2012 · 630849f · 630849f
1 parent 6f97b14
commit 630849f
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/templates/default/graphite-vhost.conf.erb b/templates/default/graphite-vhost.conf.erb
@@ -15,20 +15,18 @@
         CustomLog /opt/graphite/storage/log/webapp/access.log common
 
         <Location "/">
+                <% if node[:graphite][:graphite_web][:auth_file] -%>
+                AuthType Basic
+                AuthName "Graphite"
+                AuthUserFile <%= node[:graphite][:graphite_web][:auth_file] %>
+                Require valid-user
+                <% end -%>
                 SetHandler python-program
                 PythonPath "['/opt/graphite/webapp'] + sys.path"
                 PythonHandler django.core.handlers.modpython
                 SetEnv DJANGO_SETTINGS_MODULE graphite.settings
                 PythonDebug Off
                 PythonAutoReload Off
-                <% if node[:graphite][:graphite_web][:auth_file] -%>
-                AuthType basic
-                AuthUserFile <%= node[:graphite][:graphite_web][:auth_file] %>
-                Require valid-user
-                AllowOverride None
-                Order allow,deny
-                Allow from all
-                <% end -%>
         </Location>
 
         <Location "/content/">