From 07811af814a433ff071d9adb85440c376f7885c3 Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Sun, 4 Jul 2010 16:51:16 +0000 Subject: [PATCH] Remove hardcoding of database name, port etc Signed-off-by: Mark Hymers --- config/debian/dinstall.functions | 20 ++++++++++---------- config/debian/vars | 2 ++ scripts/debian/dm-monitor | 16 +++++++++------- scripts/debian/generate-d-i | 6 +++--- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index fc6ad473..567516d7 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -37,15 +37,15 @@ function merkel1() { # Create the postgres dump files function pgdump_pre() { - log "Creating pre-daily-cron-job backup of projectb database..." - pg_dump projectb > $base/backup/dump_pre_$(date +%Y.%m.%d-%H:%M:%S) + log "Creating pre-daily-cron-job backup of $PGDATABASE database..." + pg_dump > $base/backup/dump_pre_$(date +%Y.%m.%d-%H:%M:%S) } function pgdump_post() { - log "Creating post-daily-cron-job backup of projectb database..." + log "Creating post-daily-cron-job backup of $PGDATABASE database..." cd $base/backup POSTDUMP=$(date +%Y.%m.%d-%H:%M:%S) - pg_dump projectb > $base/backup/dump_$POSTDUMP + pg_dump > $base/backup/dump_$POSTDUMP #pg_dumpall --globals-only > $base/backup/dumpall_$POSTDUMP ln -sf $base/backup/dump_$POSTDUMP current #ln -sf $base/backup/dumpall_$POSTDUMP currentall @@ -322,8 +322,8 @@ function mkfilesindices() { ARCHLIST=$(tempfile) - log "Querying projectb..." - echo 'SELECT l.path, f.filename, a.arch_string FROM location l JOIN files f ON (f.location = l.id) LEFT OUTER JOIN (binaries b JOIN architecture a ON (b.architecture = a.id)) ON (f.id = b.file)' | psql projectb -At | sed 's/|//;s,^/srv/ftp-master.debian.org/ftp,.,' | sort >$ARCHLIST + log "Querying $PGDATABASE..." + echo 'SELECT l.path, f.filename, a.arch_string FROM location l JOIN files f ON (f.location = l.id) LEFT OUTER JOIN (binaries b JOIN architecture a ON (b.architecture = a.id)) ON (f.id = b.file)' | psql -At | sed 's/|//;s,^/srv/ftp-master.debian.org/ftp,.,' | sort >$ARCHLIST includedirs () { perl -ne 'print; while (m,/[^/]+$,) { $_=$`; print $_ . "\n" unless $d{$_}++; }' @@ -356,12 +356,12 @@ function mkfilesindices() { log "Generating suite lists" suite_list () { - printf 'SELECT DISTINCT l.path, f.filename FROM (SELECT sa.source AS source FROM src_associations sa WHERE sa.suite = %d UNION SELECT b.source AS source FROM bin_associations ba JOIN binaries b ON (ba.bin = b.id) WHERE ba.suite = %d) s JOIN dsc_files df ON (s.source = df.source) JOIN files f ON (df.file = f.id) JOIN location l ON (f.location = l.id)\n' $1 $1 | psql -F' ' -A -t projectb + printf 'SELECT DISTINCT l.path, f.filename FROM (SELECT sa.source AS source FROM src_associations sa WHERE sa.suite = %d UNION SELECT b.source AS source FROM bin_associations ba JOIN binaries b ON (ba.bin = b.id) WHERE ba.suite = %d) s JOIN dsc_files df ON (s.source = df.source) JOIN files f ON (df.file = f.id) JOIN location l ON (f.location = l.id)\n' $1 $1 | psql -F' ' -A -t - printf 'SELECT l.path, f.filename FROM bin_associations ba JOIN binaries b ON (ba.bin = b.id) JOIN files f ON (b.file = f.id) JOIN location l ON (f.location = l.id) WHERE ba.suite = %d\n' $1 | psql -F' ' -A -t projectb + printf 'SELECT l.path, f.filename FROM bin_associations ba JOIN binaries b ON (ba.bin = b.id) JOIN files f ON (b.file = f.id) JOIN location l ON (f.location = l.id) WHERE ba.suite = %d\n' $1 | psql -F' ' -A -t } - printf 'SELECT id, suite_name FROM suite\n' | psql -F' ' -At projectb | + printf 'SELECT id, suite_name FROM suite\n' | psql -F' ' -At | while read id suite; do [ -e $base/ftp/dists/$suite ] || continue ( @@ -468,7 +468,7 @@ function bts() { function merkel2() { # Push dak@merkel so it syncs the projectb there. Returns immediately, the sync runs detached - log "Trigger merkel/flotows projectb sync" + log "Trigger merkel/flotows $PGDATABASE sync" ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_merkel_projectb dak@merkel.debian.org sleep 1 # Also trigger flotow, the ftpmaster test box ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_flotow_projectb dak@flotow.debconf.org sleep 1 diff --git a/config/debian/vars b/config/debian/vars index 94182692..e8e70c73 100644 --- a/config/debian/vars +++ b/config/debian/vars @@ -33,3 +33,5 @@ copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-fr PATH=$masterdir:$PATH umask 022 +# Set the database variables +eval $(dak/admin.py config db-shell) diff --git a/scripts/debian/dm-monitor b/scripts/debian/dm-monitor index 93e36472..92a945d5 100755 --- a/scripts/debian/dm-monitor +++ b/scripts/debian/dm-monitor @@ -2,7 +2,9 @@ echo "Known debian maintainers:" -psql --html projectb < $webdir/d-i 2>&1 echo "udeb's in testing that don't (anymore) correspond to any testing source:" -psql projectb -c "select b.package, b.version, (SELECT arch_string from +psql -c "select b.package, b.version, (SELECT arch_string from architecture where b.architecture=architecture.id) as arch, s.source from bin_associations ba LEFT JOIN binaries b on (ba.bin=b.id) LEFT JOIN source s on (b.source=s.id) WHERE ba.suite=4 AND s.id NOT IN (SELECT source from @@ -20,7 +20,7 @@ src_associations WHERE suite=4) AND b.type = 'udeb' ORDER BY s.source, b.package, b.architecture;" echo "udeb's in unstable that should be in testing too:" -psql projectb -c "select b.package, b.version, (SELECT arch_string from +psql -c "select b.package, b.version, (SELECT arch_string from architecture where b.architecture=architecture.id) as arch, s.source from bin_associations ba LEFT JOIN binaries b on (ba.bin=b.id) LEFT JOIN source s on (b.source=s.id) WHERE ba.suite=5 AND NOT EXISTS (SELECT 1 FROM @@ -29,7 +29,7 @@ source from src_associations WHERE suite=4) AND b.type = 'udeb' AND b.architecture NOT IN (4,8,12) ORDER BY s.source, b.package, b.architecture;" echo "udeb's in t-p-u that should be in testing too:" -psql projectb -c "select b.package, b.version, (SELECT arch_string from +psql -c "select b.package, b.version, (SELECT arch_string from architecture where b.architecture=architecture.id) as arch, s.source from bin_associations ba LEFT JOIN binaries b on (ba.bin=b.id) LEFT JOIN source s on (b.source=s.id) WHERE ba.suite=3 AND NOT EXISTS (SELECT 1 FROM -- 2.39.2