[or-cvs] r14531: Updated and current apache configuration files for /etc/apac (check/trunk)

[ioerror@xxxxxxxx]

Author: ioerror
Date: 2008-05-02 07:44:04 -0400 (Fri, 02 May 2008)
New Revision: 14531

Added:
   check/trunk/TorCheck-Apache2-http-Conf
   check/trunk/TorCheck-Apache2-https-Conf
Removed:
   check/trunk/tor-detector-apache2-conf
   check/trunk/tor-detector-apache2-python-conf
Log:
Updated and current apache configuration files for /etc/apache2/sites-available usage.


Added: check/trunk/TorCheck-Apache2-http-Conf
===================================================================
--- check/trunk/TorCheck-Apache2-http-Conf	                        (rev 0)
+++ check/trunk/TorCheck-Apache2-http-Conf	2008-05-02 11:44:04 UTC (rev 14531)
@@ -0,0 +1,40 @@
+<VirtualHost *>
+	ServerAdmin webmaster@xxxxxxxxxxxxxx
+	ServerName check.torproject.org
+	ServerAlias check.torproject.org
+
+	DocumentRoot /var/www/tor-detector/
+	DirectoryIndex /cgi-bin/index.py
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	ScriptAlias /cgi-bin/ /var/www/tor-detector/cgi-bin/
+	<Directory "/var/www/tor-detector/cgi-bin">
+		AllowOverride None
+		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+        <Directory "/var/www/tor-detector/cgi-bin">
+                AllowOverride None
+                Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+                Order allow,deny
+                Allow from all
+
+           AddHandler mod_python .py
+           PythonHandler index
+           PythonDebug On
+
+        </Directory>
+
+	# Don't log
+	#ErrorLog /var/log/apache2/tor-detector-error.log
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	#LogLevel warn
+	#CustomLog /var/log/apache2/tor-detector-access.log combined
+	ServerSignature Off
+
+</VirtualHost>

Added: check/trunk/TorCheck-Apache2-https-Conf
===================================================================
--- check/trunk/TorCheck-Apache2-https-Conf	                        (rev 0)
+++ check/trunk/TorCheck-Apache2-https-Conf	2008-05-02 11:44:04 UTC (rev 14531)
@@ -0,0 +1,39 @@
+<VirtualHost 209.237.247.84:443>
+	ServerAdmin webmaster@xxxxxxxxxxxxxx
+	ServerName check.torproject.org
+	ServerAlias check.torproject.org
+
+        SSLEngine on
+        SSLCertificateFile /etc/apache2/ssl/check.torproject.org.cert
+        SSLCertificateKeyFile /etc/apache2/ssl/check.torproject.org.key
+        SSLProtocol all
+        SSLCipherSuite HIGH:MEDIUM
+
+	DocumentRoot /var/www/tor-detector/
+	DirectoryIndex /cgi-bin/index.py
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	ScriptAlias /cgi-bin/ /var/www/tor-detector/cgi-bin/
+	<Directory "/var/www/tor-detector/cgi-bin">
+		AllowOverride None
+		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Order allow,deny
+		Allow from all
+
+           AddHandler mod_python .py
+           PythonHandler index
+           PythonDebug On
+
+	</Directory>
+
+        # Don't log
+        #ErrorLog /var/log/apache2/tor-detector-error.log
+        # Possible values include: debug, info, notice, warn, error, crit,
+        # alert, emerg.
+        #LogLevel warn
+        #CustomLog /var/log/apache2/tor-detector-access.log combined
+        ServerSignature Off
+
+</VirtualHost>

Deleted: check/trunk/tor-detector-apache2-conf
===================================================================
--- check/trunk/tor-detector-apache2-conf	2008-05-02 11:34:20 UTC (rev 14530)
+++ check/trunk/tor-detector-apache2-conf	2008-05-02 11:44:04 UTC (rev 14531)
@@ -1,48 +0,0 @@
-# This is a virtual host config for apache2
-# Move it into production like so:
-#
-#	cp tor-detector-apache2-conf /etc/apache2/sites-available/tor-detector
-#	a2ensite tor-detector
-#
-# The vhost runs a single cgi with two images in the document root.
-# Create the document root and populate it like so:
-#
-#	mkdir -p /var/www/tor-detector/cgi-bin/
-#	cp -rv tor-off.png tor-on.png /var/www/tor-detector/
-#	cp -rv cgi-bin/index.pl /var/www/tor-detector/cgi-bin/index.pl
-#
-# Don't log requests or anything about users who are checking their IP. Ever.
-#
-# -jake <jacob@xxxxxxxxxxxxx>
-#
-<VirtualHost *>
-	ServerAdmin webmaster@xxxxxxxxxxxxxxxxxx
-	ServerName check.torproject.org
-	ServerAlias check.torproject.org
-
-	DocumentRoot /var/www/tor-detector/
-	DirectoryIndex /cgi-bin/index.pl
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-	</Directory>
-	ScriptAlias /cgi-bin/ /var/www/tor-detector/cgi-bin/
-	<Directory "/var/www/tor-detector/cgi-bin">
-		AllowOverride None
-		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Order allow,deny
-		Allow from all
-	</Directory>
-
-	# Don't log after you move this into production
-	#ErrorLog /var/log/apache2/tor-detector-error.log
-
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel warn
-
-	# Don't log here either!
-	#CustomLog /var/log/apache2/tor-detector-access.log combined
-	ServerSignature Off
-
-</VirtualHost>

Deleted: check/trunk/tor-detector-apache2-python-conf
===================================================================
--- check/trunk/tor-detector-apache2-python-conf	2008-05-02 11:34:20 UTC (rev 14530)
+++ check/trunk/tor-detector-apache2-python-conf	2008-05-02 11:44:04 UTC (rev 14531)
@@ -1,26 +0,0 @@
-NameVirtualHost *
-<VirtualHost *>
-	ServerAdmin webmaster@localhost
-	
-	DocumentRoot /var/www/
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-	</Directory>
-
-	# Required for python stuff
-        <Directory /var/www/cgi-bin/> 
-     	   AddHandler mod_python .py
-	   PythonHandler index
-     	   PythonDebug On 
-        </Directory>
-
-	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-	<Directory "/usr/lib/cgi-bin">
-		AllowOverride None
-		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Order allow,deny
-		Allow from all
-	</Directory>
-
-</VirtualHost>