Merge pull request puppetlabs#333 from brandonwamboldt/fix-pg91

Fix NOREPLICATION option for Postgres 9.1
cegeka · Jan 8, 2014 · 1e91af3 · 1e91af3
2 parents e2512d7 + 08d21a3
commit 1e91af3
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/manifests/server/role.pp b/manifests/server/role.pp
@@ -56,8 +56,14 @@
   }
 
   if(versioncmp($version, '9.1') >= 0) {
-    postgresql_psql {"ALTER ROLE \"${username}\" ${replication_sql}":
-      unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
+    if $replication_sql == '' {
+      postgresql_psql {"ALTER ROLE \"${username}\" NOREPLICATION":
+        unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
+      }
+    } else {
+      postgresql_psql {"ALTER ROLE \"${username}\" ${replication_sql}":
+        unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
+      }
     }
   }