===================================================================
RCS file: /cvs/palm/Palm-Keyring/examples/cgi/conf/keyring.conf,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -r1.2 -r1.4
--- palm/Palm-Keyring/examples/cgi/conf/keyring.conf	2009/06/15 18:48:38	1.2
+++ palm/Palm-Keyring/examples/cgi/conf/keyring.conf	2010/01/19 17:58:30	1.4
@@ -1,10 +1,12 @@
-# $RedRiver: keyring.conf,v 1.1 2009/06/11 20:40:45 andrew Exp $
-ScriptAlias /keyring/ "/keyring/bin/keyring.cgi/"
+# $RedRiver: keyring.conf,v 1.2 2009/06/15 17:48:38 andrew Exp $
+ScriptAlias /keyring/ "/var/www/keyring/bin/keyring.cgi/"
 
 <Location "/keyring">
-    RewriteEngine On
-    RewriteCond %{HTTPS} off
-    RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+	# You will need to replace us.holligan.net with your server name
+	SSLOptions +StrictRequire
+	SSLRequireSSL
+	SSLRequire %{HTTP_HOST} eq "us.holligan.net"
+	ErrorDocument 403 https://us.holligan.net/keyring/
 </Location>
 
 <Directory "/var/www/keyring">
@@ -12,6 +14,12 @@
 	Deny from all
 </Directory>
 <Directory "/var/www/keyring/bin">
+    AuthType Basic
+    AuthName "Keyring Access"
+    AuthUserFile /var/www/conf/htpasswd
+    AuthGroupFile /var/www/conf/htgroup
+    Require group keyring
+
     Options ExecCGI FollowSymLinks
     AllowOverride None
     Order allow,deny