Please review pull request #80: Ticket/master/4890 basic auth opened by (nfagerlund)
Description:
This pull request adds commented-out example configuration for using Apache basic auth with Dashboard, with two holes left open for report submission and node classification.
- Opened: Mon Jan 23 19:56:10 UTC 2012
- Based on: puppetlabs:master (5fe59b43cb8a49b938dcba5c62b4b3d90513bcd3)
- Requested merge: nfagerlund:ticket/master/4890_basic_auth (d3f8fc479dd0d4fc153319d39405e88d27b5e308)
Diff follows:
diff --git a/ext/passenger/dashboard-vhost.conf b/ext/passenger/dashboard-vhost.conf
index eec82de..74514ea 100644
--- a/ext/passenger/dashboard-vhost.conf
+++ b/ext/passenger/dashboard-vhost.conf
@@ -16,7 +16,6 @@ RailsAutoDetect On
DocumentRoot /usr/share/puppet-dashboard/public/
<Directory /usr/share/puppet-dashboard/public/>
Options None
- AllowOverride AuthConfig
Order allow,deny
allow from all
</Directory>
@@ -24,6 +23,50 @@ RailsAutoDetect On
LogLevel warn
CustomLog /var/log/apache2/dashboard.example.com_access.log combined
ServerSignature On
+
+# Uncomment this section to enable basic auth. This section can also be copied
+# to the HTTPS VirtualHost example below.
+# # For report submission from masters.
+# <Location /reports/upload>
+# <Limit POST>
+# # Configuration restricts HTTP actions to POST only
+# Order allow,deny
+# # Allow from localhost
+# # Allow from localhost.localdomain
+# # Allow from 127.0.0.1
+# # Allow from example.com
+# # This can be locked down to just your puppet master if required
+# # See examples above, or http://httpd.apache.org/docs/2.2/howto/access.html
+# Allow from all
+# Satisfy any
+# </Limit>
+# </Location>
+#
+# # For node definitions from masters.
+# <Location /nodes>
+# <Limit GET>
+# # Configuration restricts HTTP actions to GET only
+# Order allow,deny
+# # Allow from localhost.localdomain
+# # Allow from localhost
+# # Allow from 127.0.0.1
+# # Allow from example.com
+# # This can be locked down to just your puppet master if required
+# # See examples above, or http://httpd.apache.org/docs/2.2/howto/access.html
+# Allow from all
+# Satisfy any
+# </Limit>
+# </Location>
+#
+# # For web access by humans.
+# <Location "/">
+# AuthType basic
+# AuthName "Puppet Dashboard"
+# Require valid-user
+# AuthBasicProvider file
+# AuthUserFile /etc/apache2/passwords # Change to your preferred password file location
+# </Location>
+
</VirtualHost>
# Uncomment this section to enable HTTPS (SSL)
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
