Unify /org as wanna-build directory
Hello,
Attached there is a trivial patch which unifies /org as wanna-build directory.
It breaks assumption that wanna-build runs on /org and /srv, even most
systems have /org symlinked to /srv.
Cheers,
--
Héctor Orón
"Our Sun unleashes tremendous flares expelling hot gas into the Solar
System, which one day will disconnect us."
-- Day DVB-T stop working nicely
Video flare: http://antwrp.gsfc.nasa.gov/apod/ap100510.html
From e4e90f3488748a91bbab0d94fa640ae33a13e80e Mon Sep 17 00:00:00 2001
From: Hector Oron <hector.oron@toby-churchill.com>
Date: Mon, 26 Jul 2010 13:19:37 +0100
Subject: [PATCH] Directory unification (replace /srv by /org)
While wanna-build has hardcoded paths all over the place, it
seems that newly scripts tend to assume /org is a symlink to
/org. This patch unifies /org directory among the source tree.
Signed-off-by: Hector Oron <hector.oron@toby-churchill.com>
---
etc/cron/crontab | 14 +++++++-------
etc/logrotate.conf | 2 +-
libtrigger.sh | 2 +-
postrelease | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/etc/cron/crontab b/etc/cron/crontab
index 24f92c2..a9f55eb 100644
--- a/etc/cron/crontab
+++ b/etc/cron/crontab
@@ -7,17 +7,17 @@
# Stats update.
#
MAILTO=cron-errors@buildd.debian.org
-PATH=/bin:/usr/bin:/usr/local/bin:/srv/wanna-build/bin:/srv/buildd.debian.org/bin
+PATH=/bin:/usr/bin:/usr/local/bin:/org/wanna-build/bin:/org/buildd.debian.org/bin
-43 * * * * /srv/buildd.debian.org/bin/wb-export
+43 * * * * /org/buildd.debian.org/bin/wb-export
-3 0 * * * make -sC /srv/wanna-build/etc/cron check
+3 0 * * * make -sC /org/wanna-build/etc/cron check
-4 0 * * * /srv/buildd.debian.org/mbox/fix-up-permissions
+4 0 * * * /org/buildd.debian.org/mbox/fix-up-permissions
-*/15 * * * * TZ=UTC /srv/buildd.debian.org/web/status/mkstats.aba
+*/15 * * * * TZ=UTC /org/buildd.debian.org/web/status/mkstats.aba
-0 0 * * * /usr/sbin/logrotate /srv/wanna-build/etc/logrotate.conf -s /srv/wanna-build/etc/logrotate.status
+0 0 * * * /usr/sbin/logrotate /org/wanna-build/etc/logrotate.conf -s /org/wanna-build/etc/logrotate.status
-*/15 * * * * /srv/buildd.debian.org/wbpy/run-mqueue
+*/15 * * * * /org/buildd.debian.org/wbpy/run-mqueue
diff --git a/etc/logrotate.conf b/etc/logrotate.conf
index f71461d..db3ac57 100644
--- a/etc/logrotate.conf
+++ b/etc/logrotate.conf
@@ -1,4 +1,4 @@
-/srv/wanna-build/db/merge.*.log {
+/org/wanna-build/db/merge.*.log {
weekly
rotate 30
size 50M
diff --git a/libtrigger.sh b/libtrigger.sh
index 1c82eaf..aa7aa39 100644
--- a/libtrigger.sh
+++ b/libtrigger.sh
@@ -2,7 +2,7 @@ ARCHS_oldstable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
ARCHS_stable="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
ARCHS_testing="amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-amd64 kfreebsd-i386"
ARCHS_unstable="$ARCHS_testing alpha hurd-i386"
-CURLOPT="-q -s -S -R -f -Y 10 -y 120 -K /srv/wanna-build/trigger.curlrc"
+CURLOPT="-q -s -S -R -f -Y 10 -y 120 -K /org/wanna-build/trigger.curlrc"
curl_index () {
local url tmpname destname appendname curlopt
diff --git a/postrelease b/postrelease
index da81f80..61c9230 100644
--- a/postrelease
+++ b/postrelease
@@ -1,5 +1,5 @@
#!/bin/sh
-# Meant to be run from the /srv/wanna-build/db dir
+# Meant to be run from the /org/wanna-build/db dir
set -e
--
1.7.1
Reply to: