Mailing List Archive

Author: jm
Date: Sun Aug 20 13:57:04 2006
New Revision: 433044

URL: http://svn.apache.org/viewvc?rev=433044&view=rev
Log:
add vhost data for 3.1.x mass-check systems

Modified:
spamassassin/trunk/build/automc/etc-apache-local-conf-httpd.conf
spamassassin/trunk/build/automc/freqsd
spamassassin/trunk/build/automc/freqsd-infrequent

Modified: spamassassin/trunk/build/automc/etc-apache-local-conf-httpd.conf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/etc-apache-local-conf-httpd.conf?rev=433044&r1=433043&r2=433044&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/etc-apache-local-conf-httpd.conf (original)
+++ spamassassin/trunk/build/automc/etc-apache-local-conf-httpd.conf Sun Aug 20 13:57:04 2006
@@ -67,7 +67,8 @@
# ---------------------------------------------------------------------------

<VirtualHost *:80>
- ServerName bbmass.spamassassin.org
+ ServerName bbmass-trunk.spamassassin.org
+ ServerAlias bbmass.spamassassin.org
<Directory /var/www/bbmass.spamassassin.org>
options indexes SymLinksIfOwnerMatch
AllowOverride indexes
@@ -97,7 +98,8 @@
# ---------------------------------------------------------------------------

<VirtualHost *:80>
- ServerName ruleqa.spamassassin.org
+ ServerName ruleqa-trunk.spamassassin.org
+ ServerAlias ruleqa.spamassassin.org
<Directory /var/www/ruleqa.spamassassin.org>
options indexes SymLinksIfOwnerMatch
AllowOverride indexes
@@ -128,6 +130,73 @@
RewriteRule ^/(.*) /ruleqa.cgi/$1 [PT,L]

ScriptAlias /ruleqa.cgi /home/automc/svn/spamassassin/masses/rule-qa/automc/ruleqa.cgi
+
+</VirtualHost>
+
+# ---------------------------------------------------------------------------
+
+# <VirtualHost *:80>
+ # ServerName bbmass-stable.spamassassin.org
+ # <Directory /var/www/bbmass-stable.spamassassin.org>
+ # options indexes SymLinksIfOwnerMatch
+ # AllowOverride indexes
+ # </Directory>
+ # DocumentRoot /var/www/bbmass-stable.spamassassin.org
+ # ServerAdmin webmaster@spamassassin.org
+ # userdir disabled
+#
+ # RewriteEngine On
+#
+ # # index: straight through
+ # RewriteRule ^/$ http://127.0.0.1:8011/ [P]
+#
+ # # anything else; proxy, if it doesn't exist as a file/dir
+ # RewriteCond /var/www/bbmass-stable.spamassassin.org/%{REQUEST_FILENAME} !-d
+ # RewriteCond /var/www/bbmass-stable.spamassassin.org/%{REQUEST_FILENAME} !-f
+ # RewriteRule ^/(.*) http://127.0.0.1:8011/$1 [P]
+#
+ # ProxyRequests Off
+ # <Proxy *>
+ # Order deny,allow
+ # Allow from all
+ # </Proxy>
+#
+# </VirtualHost>
+
+# ---------------------------------------------------------------------------
+
+<VirtualHost *:80>
+ ServerName ruleqa-stable.spamassassin.org
+ <Directory /var/www/ruleqa-stable.spamassassin.org>
+ options indexes SymLinksIfOwnerMatch
+ AllowOverride indexes
+ </Directory>
+ DocumentRoot /var/www/ruleqa-stable.spamassassin.org
+ ServerAdmin webmaster@spamassassin.org
+ userdir disabled
+
+ # debugging:
+ # RewriteLogLevel 9
+ # RewriteLog /var/apache2/logs/rewrite_log
+
+ # "%2F" is used to grep rule subsets, allow it
+ AllowEncodedSlashes On
+
+ # strip out known-local files and loops; all else goes to the ruleqa code
+ RewriteEngine On
+
+ # index: straight through
+ RewriteRule ^/$ /ruleqa.cgi [PT,L]
+
+ # satisfy local files
+ RewriteCond /var/www/ruleqa-stable.spamassassin.org/%{REQUEST_FILENAME} !-d
+ RewriteCond /var/www/ruleqa-stable.spamassassin.org/%{REQUEST_FILENAME} !-f
+
+ # otherwise the CGI
+ RewriteCond %{REQUEST_URI} !^/ruleqa\.cgi
+ RewriteRule ^/(.*) /ruleqa.cgi/$1 [PT,L]
+
+ ScriptAlias /ruleqa.cgi /home/automc-stable/svn/spamassassin/masses/rule-qa/automc/ruleqa.cgi

</VirtualHost>


Modified: spamassassin/trunk/build/automc/freqsd
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/freqsd?rev=433044&r1=433043&r2=433044&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/freqsd (original)
+++ spamassassin/trunk/build/automc/freqsd Sun Aug 20 13:57:04 2006
@@ -24,7 +24,6 @@
my $dq_slow = IPC::DirQueue->new({ dir => "/home/automc/freqsd/dq_slow" });
$pidfile ||= "/home/automc/freqsd/pid";

-# $ENV{HOME} = '/home/bbmass';
umask(002);

# ---------------------------------------------------------------------------

Modified: spamassassin/trunk/build/automc/freqsd-infrequent
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/freqsd-infrequent?rev=433044&r1=433043&r2=433044&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/freqsd-infrequent (original)
+++ spamassassin/trunk/build/automc/freqsd-infrequent Sun Aug 20 13:57:04 2006
@@ -1,25 +1,6 @@
#!/bin/sh

-# recreate the corpus link-farm; log results to a web-visible file
-
-# BBMHOME=/home/bbmass
-#
-# (
-#
- # # create links to the user-submitted corpora in the right
- # # volumes etc.
- # date
- # ./build/automc/populate_cor
- # date
-#
- # # permit mass-check processes to create files in these dirs,
- # # so they can use the ArchiveIterator cache code
- # cd $BBMHOME/tmpfs/cor
- # find . -type d | xargs chmod 1777
-#
-# ) 2>&1 | tee \
- # /var/www/buildbot.spamassassin.org/bbmass/corpus_makeup.txt
- # # note: needs to be customised for each site
+BBMHOME=/home/bbmass

# clean up our temporary dir
cd $BBMHOME/tmp