summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-10-30 17:43:50 -0400
committerMichael DeHaan <mdehaan@redhat.com>2007-10-30 17:43:50 -0400
commit4f6d730917ea7b3e1669fa72ca3fb36118a3f106 (patch)
tree08d1e8f164c18fd467ed714d367e46fa7a26da58 /config
parenta09fb59680442993cf42cb3e0dd22fd6d0ec7efd (diff)
downloadthird_party-cobbler-4f6d730917ea7b3e1669fa72ca3fb36118a3f106.tar.gz
third_party-cobbler-4f6d730917ea7b3e1669fa72ca3fb36118a3f106.tar.xz
third_party-cobbler-4f6d730917ea7b3e1669fa72ca3fb36118a3f106.zip
Moving the auth parts to a .htaccess and out of Apache config. Tested on my box with Digest auth and seems to work well. Misc associated packaging details.
Diffstat (limited to 'config')
-rw-r--r--config/.htaccess7
-rw-r--r--config/cobbler.conf3
-rw-r--r--config/cobbler_webui.conf14
3 files changed, 10 insertions, 14 deletions
diff --git a/config/.htaccess b/config/.htaccess
new file mode 100644
index 0000000..da71c46
--- /dev/null
+++ b/config/.htaccess
@@ -0,0 +1,7 @@
+AuthUserFile /var/www/cgi-bin/cobbler/.htpasswd
+AuthGroupFile /dev/null
+AuthName "Cobbler WebUI Authentication"
+AuthType Digest
+
+require valid-user
+
diff --git a/config/cobbler.conf b/config/cobbler.conf
index 187e63e..51b68e2 100644
--- a/config/cobbler.conf
+++ b/config/cobbler.conf
@@ -22,4 +22,7 @@ ProxyPassReverse /cobbler_api http://localhost:25151/
ProxyPass /cobbler_api_rw http://localhost:25152/
ProxyPassReverse /cobbler_api_rw http://localhost:25152/
+BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
+
+# For Web UI, see also: /var/www/cgi-bin/cobbler/.htaccess
diff --git a/config/cobbler_webui.conf b/config/cobbler_webui.conf
deleted file mode 100644
index d573dd7..0000000
--- a/config/cobbler_webui.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# See: http://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#msie
-BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
-
-# set up digest authentication for the webui
-# to add users: htdigest /var/www/cgi-bin/cobbler/.htaccess "Cobbler WebUI Authentication" $username
-<Location "/var/www/cgi-bin/cobbler/webui.cgi">
- AuthType Digest
- AuthName "Cobbler WebUI Authentication"
- AuthDigestProvider file
- AuthUserFile /var/www/cgi-bin/cobbler/.htaccess
- Require valid-user
-</Location>
-