From a2acd922fec7cfc0c4e9a98a9f5acad7429f2134 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 17 Nov 2015 12:41:13 +0100 Subject: [PATCH] Switch postgres-make-base-backups to be a template, and do not backup moszumanska from backuphost --- modules/postgres/manifests/backup_server.pp | 2 +- .../backup_server/postgres-make-base-backups.erb} | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) rename modules/postgres/{files/backup_server/postgres-make-base-backups => templates/backup_server/postgres-make-base-backups.erb} (98%) diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp index e42cf8c68..2a661c049 100644 --- a/modules/postgres/manifests/backup_server.pp +++ b/modules/postgres/manifests/backup_server.pp @@ -7,7 +7,7 @@ class postgres::backup_server { } file { '/usr/local/bin/postgres-make-base-backups': - source => 'puppet:///modules/postgres/backup_server/postgres-make-base-backups', + content => template('postgres/postgres-make-base-backups.erb'), mode => '0555', } if $::hostname in [backuphost] { diff --git a/modules/postgres/files/backup_server/postgres-make-base-backups b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb similarity index 98% rename from modules/postgres/files/backup_server/postgres-make-base-backups rename to modules/postgres/templates/backup_server/postgres-make-base-backups.erb index ab3d96249..793bb44b5 100755 --- a/modules/postgres/files/backup_server/postgres-make-base-backups +++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb @@ -93,5 +93,7 @@ bmdb1.debian.org 5436 debian-backup wannabuild 9.4 danzi.debian.org 5433 debian-backup main 9.4 franck.debian.org 5433 debian-backup dak 9.4 sibelius.debian.org 5433 debian-backup snapshot 9.4 +<%- if hostname != "backuphost" -%> moszumanska.debian.org 5432 debian-backup main 9.1 +<%- end -%> EOF -- 2.20.1