changeset 53:8279fc1536a7

Fixes to README etc

--- a/.hgsubstate	Tue Jun 24 13:35:48 2014 +0100
+++ b/.hgsubstate	Tue Jun 24 14:13:09 2014 +0100
@@ -1,4 +1,4 @@
 0353cb3d16305b081f3df9dd6942b71b1fc7a74e forum
 bb33b0c7548142d47da21b3ece7b6a6d9bb16e6a public
-050bdf2ff304a07ce59a782a857170365bf50b00 rdf
+14db9be7c98ec37225f6c6236f2315acf05fb11c rdf
 f1f06769abacc6732e511774d4db2306cbe5db54 spark

--- a/README.txt	Tue Jun 24 13:35:48 2014 +0100
+++ b/README.txt	Tue Jun 24 14:13:09 2014 +0100
@@ -33,8 +33,10 @@
 	ServerName vamp-plugins.org
 	ServerAlias www.vamp-plugins.org 
 	
-	DocumentRoot /var/www/vamp-plugins.org
-	<Directory /var/www/vamp-plugins.org>
+	# Avoid serving anything unwarranted because of a forgotten
+	# alias or proxypass, by making the root be the public dir
+	DocumentRoot /var/www/vamp-plugins.org/public
+	<Directory /var/www/vamp-plugins.org/public>
 		Options None
 		AllowOverride None
 		Order allow,deny
@@ -57,16 +59,23 @@
                 Satisfy All
         </DirectoryMatch>
 
-	<Directory /var/www/vamp-plugins.org/pre>
-		Options +Indexes
-	</Directory>
+	# Exclude static rdf directory from the subsequent ProxyPass
+	ProxyPass /rdf !
+	
+	# Exclude the PHP forum from the subsequent ProxyPass
+	ProxyPass /forum !
 
-	<Directory /var/www/vamp-plugins.org/forum>
-		AddHandler fcgid-script .php
-		FCGIWrapper /usr/lib/cgi-bin/php5 .php
-		Options +ExecCGI
-		Options -MultiViews
-	</Directory>
+	# Exclude the wiki redirect from the subsequent ProxyPass
+	ProxyPass /wiki !
+
+	# Everything not excluded above gets served by Spark app
+	ProxyPass / http://localhost:4567/
+
+	# RDF dir we serve as a set of static files, but we enable
+        # *.n3 to be accessed without the .n3 extension so as to
+	# resolve the URIs of plugin resources
+
+	Alias /rdf /var/www/vamp-plugins.org/rdf
 
 	<Directory /var/www/vamp-plugins.org/rdf>
 		AddType application/rdf+xml .rdf
@@ -80,27 +89,34 @@
                 ExpiresDefault "access plus 5 minutes"
 	</Directory>
 
+	# Directory index allowed on plugin RDF dir
+
 	<Directory /var/www/vamp-plugins.org/rdf/plugins>
 		Options +Indexes
                 ExpiresDefault "access plus 5 minutes"
 	</Directory>
 
-	Redirect seeother /wiki http://code.soundsoftware.ac.uk/projects/vamp-p
-lugin-sdk/wiki
+	# Forum is a PHP application which we run through FCGI
 
-        <Directory /var/www/vamp-plugins.org/logs>
-                AuthUserFile "/var/www/.cannamlogs.htdigest"
-                AuthName "Server Usage Statistics"
-                AuthType Digest
-                Require user cannamlogs
-        </Directory>
+	Alias /forum /var/www/vamp-plugins.org/forum
 
-	ErrorLog /var/log/apache2/error.log
+	<Directory /var/www/vamp-plugins.org/forum>
+		AddHandler fcgid-script .php
+		FCGIWrapper /usr/lib/cgi-bin/php5 .php
+		Options +ExecCGI
+		Options -MultiViews
+	</Directory>
+
+	# Wiki is a redirect to the SoundSoftware code site
+
+	Redirect seeother /wiki http://code.soundsoftware.ac.uk/projects/vamp-plugin-sdk/wiki
+
+	ErrorLog /var/log/httpd/error.log
 
 	# Possible values include: debug, info, notice, warn, error, crit,
 	# alert, emerg.
 	LogLevel warn
 
-	CustomLog /var/log/apache2/vamp-plugins.log varnishcombined
 	ServerSignature Off
 </VirtualHost>
+