From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 28 Jun 2018 11:15:01 +0000 (+0200)
Subject: Fix dumps when postgres port is present
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=bd9c5fa8864e6531bc8bcb4ce8ad72551d668865

Fix dumps when postgres port is present
---

diff --git a/modules/profile/manifests/postgresql/backup_dump.pp b/modules/profile/manifests/postgresql/backup_dump.pp
index 10e349a..53fb20e 100644
--- a/modules/profile/manifests/postgresql/backup_dump.pp
+++ b/modules/profile/manifests/postgresql/backup_dump.pp
@@ -1,6 +1,7 @@
 define profile::postgresql::backup_dump (
-  String $pg_user  = "postgres",
-  String $pg_group = "postgres",
+  String                             $pg_user  = "postgres",
+  String                             $pg_group = "postgres",
+  Optional[Variant[String, Integer]] $pg_port  = undef,
 ) {
   $base_path        = $title
   $pg_path          = "$base_path/postgresql"
@@ -23,12 +24,18 @@ define profile::postgresql::backup_dump (
     require => File[$base_path],
   }
 
+  if $pg_port and !empty($pg_port) {
+    $pg_port_arg = " -p $pg_port"
+  } else {
+    $pg_port_arg = ""
+  }
+
   cron::job::multiple { "backup_psql_$pg_host":
     ensure  => "present",
     require => [File[$pg_backup_path], File[$pg_path]],
     jobs    => [
       {
-        command     => "/usr/bin/pg_dumpall -h $pg_path -f $pg_backup_path/\$(date -Iseconds).sql",
+        command     => "/usr/bin/pg_dumpall -h $pg_path$pg_port_arg -f $pg_backup_path/\$(date -Iseconds).sql",
         user        => $pg_user,
         hour        => "22,4,10,16",
         minute      => 0,
diff --git a/modules/profile/manifests/postgresql/backup_replication.pp b/modules/profile/manifests/postgresql/backup_replication.pp
index a4edb8f..1526123 100644
--- a/modules/profile/manifests/postgresql/backup_replication.pp
+++ b/modules/profile/manifests/postgresql/backup_replication.pp
@@ -61,6 +61,8 @@ define profile::postgresql::backup_replication (
       target => "$pg_path/pg_hba.conf",
     }
   } else {
+    $pg_listen_port = undef
+
     concat::fragment { "$pg_path/postgresql.conf listen":
       target  => "$pg_path/postgresql.conf",
       content => "listen_addresses = ''\n",
@@ -130,6 +132,8 @@ define profile::postgresql::backup_replication (
   }
 
   # Dumps
-  profile::postgresql::backup_dump { "$base_path/$pg_backup_host": }
+  profile::postgresql::backup_dump { "$base_path/$pg_backup_host":
+    pg_port => $pg_listen_port,
+  }
 
 }