From e9e6c1abe830ad5d653c9afd237f437fb07ee3ed Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 28 Sep 2019 20:25:07 +0200
Subject: [PATCH 1/1] Move files for pg-backup-file from roles to postgres
 module

---
 .../files/backup_source}/pg-backup-file                  | 0
 modules/postgres/manifests/backup_source.pp              | 9 +++++----
 .../templates/backup_source}/pg-backup-file.conf.erb     | 0
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename modules/{roles/files/postgresql_server => postgres/files/backup_source}/pg-backup-file (100%)
 rename modules/{roles/templates/postgresql_server => postgres/templates/backup_source}/pg-backup-file.conf.erb (100%)

diff --git a/modules/roles/files/postgresql_server/pg-backup-file b/modules/postgres/files/backup_source/pg-backup-file
similarity index 100%
rename from modules/roles/files/postgresql_server/pg-backup-file
rename to modules/postgres/files/backup_source/pg-backup-file
diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index b406d0dbe..e642ca732 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -4,15 +4,16 @@
 class postgres::backup_source {
   file { '/usr/local/bin/pg-backup-file':
     mode   => '0555',
-    source => 'puppet:///modules/roles/postgresql_server/pg-backup-file',
+    source => 'puppet:///modules/postgres/backup_sources/pg-backup-file',
   }
+  file { '/etc/dsa/pg-backup-file.conf':
+    content => template('postgres/backup_sources/pg-backup-file.conf.erb'),
+  }
+
   file { '/usr/local/bin/pg-receive-file-from-backup':
     mode   => '0555',
     source => 'puppet:///modules/roles/postgresql_server/pg-receive-file-from-backup',
   }
-  file { '/etc/dsa/pg-backup-file.conf':
-    content => template('roles/postgresql_server/pg-backup-file.conf.erb'),
-  }
 
   ssh::keygen {'postgres': }
 }
diff --git a/modules/roles/templates/postgresql_server/pg-backup-file.conf.erb b/modules/postgres/templates/backup_source/pg-backup-file.conf.erb
similarity index 100%
rename from modules/roles/templates/postgresql_server/pg-backup-file.conf.erb
rename to modules/postgres/templates/backup_source/pg-backup-file.conf.erb
-- 
2.20.1