[or-cvs] r13274: * Move apache configs to a sane place * Fix / (in weather: . setup trunk)

[pde@xxxxxxxx]

Author: pde
Date: 2008-01-25 04:09:44 -0500 (Fri, 25 Jan 2008)
New Revision: 13274

Added:
   weather/setup/
   weather/setup/tor-weather-apache2.conf
Removed:
   weather/trunk/tor-weather-apache2.conf
Modified:
   weather/trunk/weather.py
Log:
* Move apache configs to a sane place
* Fix /



Copied: weather/setup/tor-weather-apache2.conf (from rev 13272, weather/trunk/tor-weather-apache2.conf)
===================================================================
--- weather/setup/tor-weather-apache2.conf	                        (rev 0)
+++ weather/setup/tor-weather-apache2.conf	2008-01-25 09:09:44 UTC (rev 13274)
@@ -0,0 +1,38 @@
+<VirtualHost *>
+	ServerAdmin tor-ops@xxxxxxxxxxxxxx
+	ServerName weather.torproject.org
+	ServerAlias weather.torproject.org
+
+	DocumentRoot /var/www/tor-weather/
+	DirectoryIndex /weather.py/
+
+	<Directory "/var/www/tor-weather/">
+
+		# This gives us pretty and reasonable urls
+		RewriteEngine on
+		RewriteBase /
+		RewriteCond %{REQUEST_URI} !^(/.*)+weather.py/
+		RewriteRule ^(.*)$ weather.py/$1 [PT]
+
+		# Disallow .htaccess trickery
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+
+		# Ensure the proper handler for weather.py
+		<Files weather.py>
+			SetHandler fastcgi-script
+		</Files>
+
+	</Directory>
+
+  LogFormat "%t \"%r\" %>s %b" noip
+	CustomLog /var/log/apache2/tor-weather-access.log noip
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+	ServerSignature Off
+
+</VirtualHost>

Deleted: weather/trunk/tor-weather-apache2.conf
===================================================================
--- weather/trunk/tor-weather-apache2.conf	2008-01-25 09:02:25 UTC (rev 13273)
+++ weather/trunk/tor-weather-apache2.conf	2008-01-25 09:09:44 UTC (rev 13274)
@@ -1,38 +0,0 @@
-<VirtualHost *>
-	ServerAdmin tor-ops@xxxxxxxxxxxxxx
-	ServerName weather.torproject.org
-	ServerAlias weather.torproject.org
-
-	DocumentRoot /var/www/tor-weather/
-	DirectoryIndex /weather.py/
-
-	<Directory "/var/www/tor-weather/">
-
-		# This gives us pretty and reasonable urls
-		RewriteEngine on
-		RewriteBase /
-		RewriteCond %{REQUEST_URI} !^(/.*)+weather.py/
-		RewriteRule ^(.*)$ weather.py/$1 [PT]
-
-		# Disallow .htaccess trickery
-		AllowOverride None
-		Order allow,deny
-		Allow from all
-
-		# Ensure the proper handler for weather.py
-		<Files weather.py>
-			SetHandler fastcgi-script
-		</Files>
-
-	</Directory>
-
-	ErrorLog /var/log/apache2/tor-weather-error.log
-
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel warn
-
-	CustomLog /var/log/apache2/tor-weather-access.log combined
-	ServerSignature Off
-
-</VirtualHost>

Modified: weather/trunk/weather.py
===================================================================
--- weather/trunk/weather.py	2008-01-25 09:02:25 UTC (rev 13273)
+++ weather/trunk/weather.py	2008-01-25 09:09:44 UTC (rev 13274)
@@ -19,6 +19,7 @@
 DNS.ParseResolvConf()
 
 urls = (
+'/', 'subscribe',
 '/subscribe', 'subscribe', 
 '/confirm-subscribe/(.*)', 'confirm',
 '/unsubscribe/(.*)', 'unsubscribe'