You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/01/30 16:56:08 UTC
svn commit: r501427 - in /spamassassin/trunk/build/automc: automc-by-mail
buildbot_ready etc-apache-local-conf-httpd.conf etc-init.d-bbmass
etc-init.d-buildbot etc-init.d-freqsd freqsd freqsd-infrequent
populate_cor_nightly run_nightly run_preflight
Author: jm
Date: Tue Jan 30 07:56:04 2007
New Revision: 501427
URL: http://svn.apache.org/viewvc?view=rev&rev=501427
Log:
replace use of /home with /export/home directly -- apparently it is better for zone I/O
Modified:
spamassassin/trunk/build/automc/automc-by-mail
spamassassin/trunk/build/automc/buildbot_ready
spamassassin/trunk/build/automc/etc-apache-local-conf-httpd.conf
spamassassin/trunk/build/automc/etc-init.d-bbmass
spamassassin/trunk/build/automc/etc-init.d-buildbot
spamassassin/trunk/build/automc/etc-init.d-freqsd
spamassassin/trunk/build/automc/freqsd
spamassassin/trunk/build/automc/freqsd-infrequent
spamassassin/trunk/build/automc/populate_cor_nightly
spamassassin/trunk/build/automc/run_nightly
spamassassin/trunk/build/automc/run_preflight
Modified: spamassassin/trunk/build/automc/automc-by-mail
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/automc-by-mail?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/automc-by-mail (original)
+++ spamassassin/trunk/build/automc/automc-by-mail Tue Jan 30 07:56:04 2007
@@ -17,7 +17,7 @@
)/isx;
# where the files are saved
-my $OUT_DIR = "/home/bbmass/bymail";
+my $OUT_DIR = "/export/home/bbmass/bymail";
# URL used to trigger the buildbot to build
my $BB_URL = 'http://buildbot.spamassassin.org/preflight/__SLAVE__'.
Modified: spamassassin/trunk/build/automc/buildbot_ready
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/buildbot_ready?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/buildbot_ready (original)
+++ spamassassin/trunk/build/automc/buildbot_ready Tue Jan 30 07:56:04 2007
@@ -1,12 +1,12 @@
#!/usr/bin/perl
-my $BBMHOME = '/home/bbmass';
-my $BYMAILLOG = '/home/bbmass/bymail/extract.log';
-my $BYMAILCF = '/home/bbmass/bymail/latest.cf';
+my $BBMHOME = '/export/home/bbmass';
+my $BYMAILLOG = '/export/home/bbmass/bymail/extract.log';
+my $BYMAILCF = '/export/home/bbmass/bymail/latest.cf';
my $RULEQAURL = 'http://ruleqa.spamassassin.org/';
# where do the reporting scripts get run from?
-my $REPORTSCRIPTSADIR = "/home/automc/svn/spamassassin";
+my $REPORTSCRIPTSADIR = "/export/home/automc/svn/spamassassin";
# ---------------------------------------------------------------------------
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?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/etc-apache-local-conf-httpd.conf (original)
+++ spamassassin/trunk/build/automc/etc-apache-local-conf-httpd.conf Tue Jan 30 07:56:04 2007
@@ -3,7 +3,7 @@
#
# Update Apache config like so:
#
-# cd /home/automc/svn/spamassassin; sudo -u automc svn up
+# cd /export/home/automc/svn/spamassassin; sudo -u automc svn up
# sudo /etc/init.d/apache2 restart ; tail /var/apache2/logs/error_log
# ---------------------------------------------------------------------------
@@ -108,7 +108,7 @@
ServerAdmin webmaster@spamassassin.org
userdir disabled
- Alias /ruleqa.css /home/automc/svn/spamassassin/masses/rule-qa/automc/ruleqa.css
+ Alias /ruleqa.css /export/home/automc/svn/spamassassin/masses/rule-qa/automc/ruleqa.css
# debugging:
# RewriteLogLevel 9
@@ -133,7 +133,7 @@
RewriteCond %{REQUEST_URI} !^/ruleqa\.cgi
RewriteRule ^/(.*) /ruleqa.cgi/$1 [PT,L]
- ScriptAlias /ruleqa.cgi /home/automc/svn/spamassassin/masses/rule-qa/automc/ruleqa.cgi
+ ScriptAlias /ruleqa.cgi /export/home/automc/svn/spamassassin/masses/rule-qa/automc/ruleqa.cgi
</VirtualHost>
@@ -200,7 +200,7 @@
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
+ ScriptAlias /ruleqa.cgi /export/home/automc-stable/svn/spamassassin/masses/rule-qa/automc/ruleqa.cgi
</VirtualHost>
@@ -208,11 +208,11 @@
<VirtualHost *:80>
ServerName rsync.spamassassin.org
- <Directory /home/corpus-rsync/corpus>
+ <Directory /export/home/corpus-rsync/corpus>
options indexes SymLinksIfOwnerMatch
AllowOverride indexes
</Directory>
- DocumentRoot /home/corpus-rsync/corpus
+ DocumentRoot /export/home/corpus-rsync/corpus
ServerAdmin webmaster@spamassassin.org
userdir disabled
</VirtualHost>
Modified: spamassassin/trunk/build/automc/etc-init.d-bbmass
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/etc-init.d-bbmass?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/etc-init.d-bbmass (original)
+++ spamassassin/trunk/build/automc/etc-init.d-bbmass Tue Jan 30 07:56:04 2007
@@ -3,7 +3,7 @@
# to create a new slave:
#
# PASSWORD=[whatever]
-# buildbot slave /home/buildbot/slaves/slave-name buildbot.spamassassin.org:9989 slave-name $PASSWORD
+# buildbot slave /export/home/buildbot/slaves/slave-name buildbot.spamassassin.org:9989 slave-name $PASSWORD
# to use a real tmpfs, add this to /etc/vfstab:
#
@@ -21,11 +21,11 @@
prog=bbmass
runall () {
- su buildbot -c "buildbot $1 /home/buildbot/bots/bbmass"
- nice su bbmass -c "buildbot $1 /home/bbmass/slaves/mc-fast"
- nice su bbmass -c "buildbot $1 /home/bbmass/slaves/mc-med"
- nice su bbmass -c "buildbot $1 /home/bbmass/slaves/mc-slow"
- nice su bbmass -c "buildbot $1 /home/bbmass/slaves/mc-slower"
+ su buildbot -c "buildbot $1 /export/home/buildbot/bots/bbmass"
+ nice su bbmass -c "buildbot $1 /export/home/bbmass/slaves/mc-fast"
+ nice su bbmass -c "buildbot $1 /export/home/bbmass/slaves/mc-med"
+ nice su bbmass -c "buildbot $1 /export/home/bbmass/slaves/mc-slow"
+ nice su bbmass -c "buildbot $1 /export/home/bbmass/slaves/mc-slower"
}
start() {
Modified: spamassassin/trunk/build/automc/etc-init.d-buildbot
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/etc-init.d-buildbot?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/etc-init.d-buildbot (original)
+++ spamassassin/trunk/build/automc/etc-init.d-buildbot Tue Jan 30 07:56:04 2007
@@ -3,7 +3,7 @@
# to create a new slave:
#
# PASSWORD=[whatever]
-# buildbot slave /home/buildbot/slaves/slave-name buildbot.spamassassin.org:9988 slave-name $PASSWORD
+# buildbot slave /export/home/buildbot/slaves/slave-name buildbot.spamassassin.org:9988 slave-name $PASSWORD
. /etc/profile
@@ -15,9 +15,9 @@
prog=buildbot
runall () {
- su buildbot -c "buildbot $1 /home/buildbot/bots/sa"
- nice su buildbot -c "buildbot $1 /home/buildbot/slaves/zone-sol10"
- nice su buildbot -c "buildbot $1 /home/buildbot/slaves/sol10-perl561"
+ su buildbot -c "buildbot $1 /export/home/buildbot/bots/sa"
+ nice su buildbot -c "buildbot $1 /export/home/buildbot/slaves/zone-sol10"
+ nice su buildbot -c "buildbot $1 /export/home/buildbot/slaves/sol10-perl561"
}
start() {
Modified: spamassassin/trunk/build/automc/etc-init.d-freqsd
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/etc-init.d-freqsd?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/etc-init.d-freqsd (original)
+++ spamassassin/trunk/build/automc/etc-init.d-freqsd Tue Jan 30 07:56:04 2007
@@ -10,14 +10,14 @@
start() {
echo "Starting $prog: "
- cd /home/automc/svn/spamassassin
- rm /home/automc/freqsd/log
+ cd /export/home/automc/svn/spamassassin
+ rm /export/home/automc/freqsd/log
- HOME=/home/automc
+ HOME=/export/home/automc
export HOME
- su automc -c "./build/automc/freqsd -pidfile /home/automc/freqsd/pid" \
- > /home/automc/freqsd/log 2>&1 \
+ su automc -c "./build/automc/freqsd -pidfile /export/home/automc/freqsd/pid" \
+ > /export/home/automc/freqsd/log 2>&1 \
< /dev/null &
echo
@@ -25,8 +25,8 @@
}
stop() {
- cd /home/automc/svn/spamassassin
- su automc -c "./build/automc/freqsd -pidfile /home/automc/freqsd/pid -kill"
+ cd /export/home/automc/svn/spamassassin
+ su automc -c "./build/automc/freqsd -pidfile /export/home/automc/freqsd/pid -kill"
# sleep 1
# pkill -15 -f automc/freqsd # just in case
Modified: spamassassin/trunk/build/automc/freqsd
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/freqsd?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/freqsd (original)
+++ spamassassin/trunk/build/automc/freqsd Tue Jan 30 07:56:04 2007
@@ -20,9 +20,9 @@
"kill" => \$opt_kill,
);
-my $dq_fast = IPC::DirQueue->new({ dir => "/home/automc/freqsd/dq_fast" });
-my $dq_slow = IPC::DirQueue->new({ dir => "/home/automc/freqsd/dq_slow" });
-$pidfile ||= "/home/automc/freqsd/pid";
+my $dq_fast = IPC::DirQueue->new({ dir => "/export/home/automc/freqsd/dq_fast" });
+my $dq_slow = IPC::DirQueue->new({ dir => "/export/home/automc/freqsd/dq_slow" });
+$pidfile ||= "/export/home/automc/freqsd/pid";
umask(002);
Modified: spamassassin/trunk/build/automc/freqsd-infrequent
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/freqsd-infrequent?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/freqsd-infrequent (original)
+++ spamassassin/trunk/build/automc/freqsd-infrequent Tue Jan 30 07:56:04 2007
@@ -1,6 +1,6 @@
#!/bin/sh
-BBMHOME=/home/bbmass
+BBMHOME=/export/home/bbmass
# clean up our temporary dir
cd $BBMHOME/tmp
Modified: spamassassin/trunk/build/automc/populate_cor_nightly
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/populate_cor_nightly?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/populate_cor_nightly (original)
+++ spamassassin/trunk/build/automc/populate_cor_nightly Tue Jan 30 07:56:04 2007
@@ -6,11 +6,11 @@
use strict;
use warnings;
-my $SADIR="/home/automc/svn/spamassassin";
+my $SADIR="/export/home/automc/svn/spamassassin";
# both of these must be writable
-my $TGTS_DIR = "/home/bbmass/mc-nightly";
-my $RAWCOR_DIR = "/home/bbmass/rawcor";
+my $TGTS_DIR = "/export/home/bbmass/mc-nightly";
+my $RAWCOR_DIR = "/export/home/bbmass/rawcor";
if (!-d $TGTS_DIR) {
mkdir ($TGTS_DIR) or die "cannot create $TGTS_DIR";
Modified: spamassassin/trunk/build/automc/run_nightly
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/run_nightly?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/run_nightly (original)
+++ spamassassin/trunk/build/automc/run_nightly Tue Jan 30 07:56:04 2007
@@ -1,7 +1,7 @@
#!/bin/sh
#
# driver for nightly mass-checks on the zone. run from cron as:
-# 10 9,10 * * * /home/automc/svn/spamassassin/build/automc/run_nightly > /var/www/buildbot.spamassassin.org/bbmass/nightly_masschecks.txt 2>&1
+# 10 9,10 * * * /export/home/automc/svn/spamassassin/build/automc/run_nightly > /var/www/buildbot.spamassassin.org/bbmass/nightly_masschecks.txt 2>&1
#
# details: http://wiki.apache.org/spamassassin/NightlyMassCheck
@@ -14,7 +14,7 @@
"
# and where the $HOMEs are:
-nightly_trees="/home/bbmass/mc-nightly"
+nightly_trees="/export/home/bbmass/mc-nightly"
# Ensure we're running after 0900 UTC; complex due to daylight savings. If
@@ -31,7 +31,7 @@
)
# create the targets files:
-/home/automc/svn/spamassassin/build/automc/populate_cor_nightly
+/export/home/automc/svn/spamassassin/build/automc/populate_cor_nightly
echo "run_nightly starting at" ; date
Modified: spamassassin/trunk/build/automc/run_preflight
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/run_preflight?view=diff&rev=501427&r1=501426&r2=501427
==============================================================================
--- spamassassin/trunk/build/automc/run_preflight (original)
+++ spamassassin/trunk/build/automc/run_preflight Tue Jan 30 07:56:04 2007
@@ -3,7 +3,7 @@
use strict;
sub run;
-my $BYMAILCF = '/home/bbmass/bymail/latest.cf';
+my $BYMAILCF = '/export/home/bbmass/bymail/latest.cf';
my $perl = $^X;
@@ -99,8 +99,8 @@
"--cachedir=/tmpfs/aicache ".
"--after='6 months ago' ".
$mass_check_args{$slavename}." ".
- "ham:detect:/home/bbmass/rawcor/*/ham/* ".
- "spam:detect:/home/bbmass/rawcor/*/spam/*";
+ "ham:detect:/export/home/bbmass/rawcor/*/ham/* ".
+ "spam:detect:/export/home/bbmass/rawcor/*/spam/*";
exit;