add tracker db @ danzi to backuppg

[mirror/dsa-puppet.git] / modules / postgres / templates / backup_server / postgres-make-base-backups.erb

diff --git a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
index 19d6a72..ab6cac8 100755 (executable)
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -96,7 +96,7 @@ while read host port username  cluster version; do
     flagfilesuccess="$STATEDIR/$host-$port.last-success"
     if [ -n "$forcehostport" ]; then
         if [ "$forcehostport" != "$host:$port" ]; then
-            log "Skipping $host:$port $version/$cluster because this run is limited to $host:$port."
+            log "Skipping $host:$port $version/$cluster because this run is limited to $forcehostport."
             runme=0
         else
             log "Forcing $host:$port $version/$cluster run."
@@ -152,6 +152,7 @@ while read host port username  cluster version; do
             log "Running $host:$port $version/$cluster."
             /usr/local/bin/postgres-make-one-base-backup "$host" "$port" "$username" "$cluster" "$version"
             rc=$?
+            log "Base backup for $host:$port $version/$cluster exited with rc $rc."
             [ "$rc" = 0 ] && touch "$flagfilesuccess"
             flock -u 201
         else
@@ -160,15 +161,12 @@ while read host port username  cluster version; do
     fi
 done << EOF
 seger.debian.org       5432    debian-backup           dak             9.6
+danzi.debian.org       5432    debian-backup           tracker         9.6
 bmdb1.debian.org       5435    debian-backup           main            9.6
-bmdb1.debian.org       5436    debian-backup           wannabuild      9.6
+danzi.debian.org       5436    debian-backup           wannabuild      9.6
 bmdb1.debian.org       5440    debian-backup           debsources      9.6
 fasolo.debian.org      5433    debian-backup           dak             9.6
-sibelius.debian.org    5433    debian-backup           snapshot        9.4
-sallinen.debian.org    443     debian-backup           snapshot        9.6
-<%- if @hostname != "backuphost" -%>
-moszumanska.debian.org 5432    debian-backup           main            9.1
-<%- end -%>
+sallinen.debian.org    5473    debian-backup           snapshot        9.6
 #
 # puppet notice:  this is just a partial file.  The tail EOF comes
 # from a different concat fragment