From 5b28da9b5c2b61b46e8fbf2cf0feb2ec9de246d8 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 20 Oct 2007 00:41:44 +0000
Subject: Major rewrite. Add OpenID support.

---
 apache2/sites-available/users.secure-example.com | 71 +++++++++++++++++-------
 1 file changed, 51 insertions(+), 20 deletions(-)

(limited to 'apache2/sites-available/users.secure-example.com')

diff --git a/apache2/sites-available/users.secure-example.com b/apache2/sites-available/users.secure-example.com
index bd937b0..5b46c52 100644
--- a/apache2/sites-available/users.secure-example.com
+++ b/apache2/sites-available/users.secure-example.com
@@ -1,46 +1,77 @@
-<VirtualHost *:80>
-	ServerName	users.example.com
-	ServerAlias	users
+<VirtualHost *:443>
+	ServerName	users.example.com:443
 	ServerAdmin	webmaster@example.com
 
-	DocumentRoot	/home/webmaster/public_websites/users.example.com/
+	DocumentRoot	/var/www/vhosts/web-static/users.example.com/
 
-	Include		/etc/apache2/conf.d/local-userdir.conf
-	Include		/etc/apache2/conf.d/local-macvolumes.conf
+	Include		/etc/apache2/conf.d/local-ssl.conf
+#	Include		/etc/apache2/conf.d/local-userdir.conf
+#	Include		/etc/apache2/conf.d/local-macvolumes.conf
+
+	# Support OpenID using Gracie
 
 	RewriteEngine	On
-	RewriteRule	^/-(.*)$	http://users.example.com/~$1	[R]
-	RewriteRule	^/([^~].*)$	http://users.example.com/~$1	[R]
+	RewriteRule	^/(login|id/.*)	http://localhost:8000/$1	[L,P]
+	RewriteRule	^/-(.*)		https://users.example.com/~$1	[R]
+	RewriteRule	^/([^~].*)	https://users.example.com/~$1	[R]
+
+	# prevent the webserver from beeing used as proxy
+	<LocationMatch "^[^/]">
+		Deny from all
+	</LocationMatch>
 
+	<ProxyMatch http://localhost:8000/.*>
+		Order deny,allow
+		Allow from all
+	</ProxyMatch>
+	
 	ErrorLog	/var/log/apache2/users.example.com-error.log
 	CustomLog	/var/log/apache2/users.example.com-access.log combined
 </VirtualHost>
-<VirtualHost *:80>
-	ServerName	www.users.example.com
-	ServerAlias	*.users.example.com
+#<VirtualHost *:80>
+#	ServerName	users.example.com
+#	ServerAlias	users
+#	ServerAdmin	webmaster@example.com
+#
+#	DocumentRoot	/var/www/vhosts/web-static/users.example.com/
+#
+#	Include		/etc/apache2/conf.d/local-userdir.conf
+#	Include		/etc/apache2/conf.d/local-macvolumes.conf
+#
+#	RewriteEngine	On
+#	RewriteRule	^/(login|id/.*)	https://users.example.com/$1	[R]
+#	RewriteRule	^/-(.*)		http://users.example.com/~$1	[R]
+#	RewriteRule	^/([^~].*)	http://users.example.com/~$1	[R]
+#
+#	TransferLog	/dev/null
+#	ErrorLog	/var/log/apache2/users.example.com-error.log
+#	CustomLog	/var/log/apache2/users.example.com-access.log combined
+#</VirtualHost>
+<VirtualHost *:443>
+	ServerName	www.users.example.com:443
+	ServerAlias	*.users.example.com:443
+	ServerAlias	users:443
+	ServerAlias	*.users:443
 	ServerAdmin	webmaster@example.com
 
+	Include		/etc/apache2/conf.d/local-ssl.conf
 	Include		/etc/apache2/conf.d/local-log-origin.conf
 
 	RewriteEngine	On
-	RewriteRule	/	http://users.example.com/	[R]
-#	RewriteRule	/(.*)	http://users.example.com/$1	[R]
+	RewriteRule	/	https://users.example.com/	[R]
 
 	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
-<VirtualHost *:443>
-	ServerName	users.example.com:443
-	ServerAlias	*.users.example.com:443
-	ServerAlias	users:443
-	ServerAlias	*.users:443
+<VirtualHost *:80>
+	ServerName	www.users.example.com
+	ServerAlias	*.users.example.com
+	ServerAlias	*.users
 	ServerAdmin	webmaster@example.com
 
-	Include		/etc/apache2/conf.d/local-ssl.conf
 	Include		/etc/apache2/conf.d/local-log-origin.conf
 
 	RewriteEngine	On
 	RewriteRule	/	http://users.example.com/	[R]
-#	RewriteRule	/(.*)	http://users.example.com/$1	[R]
 
 	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
-- 
cgit v1.2.3