Add sslmode property to pg_sqitch resource

Signed-off-by: Zane Geiger <zane.geiger@relativity.com>
chef-boneyard · Mar 4, 2019 · a0e1c46 · a0e1c46
1 parent 276633f
commit a0e1c46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/omnibus/files/pushy-server-cookbooks/opscode-pushy-server/providers/pg_sqitch.rb b/omnibus/files/pushy-server-cookbooks/opscode-pushy-server/providers/pg_sqitch.rb
@@ -20,7 +20,7 @@ def whyrun_supported?
       EOM
       environment "PERL5LIB" => "", # force us to use omnibus perl
                   "PGPASSWORD" => new_resource.password,
-                  "PGSSLMODE" => node['pushy']['postgresql']['sslmode']
+                  "PGSSLMODE" => new_resource.sslmode
 
       # Sqitch Return Codes
       # 0 - when changes are applied

diff --git a/omnibus/files/pushy-server-cookbooks/opscode-pushy-server/recipes/push_database.rb b/omnibus/files/pushy-server-cookbooks/opscode-pushy-server/recipes/push_database.rb
@@ -55,4 +55,5 @@
   username  push_attrs['db_superuser']
   password  PushServer::Secrets.veil.get('postgresql', 'db_superuser_password')
   database database_name
+  sslmode  push_attrs['sslmode']
 end
diff --git a/omnibus/files/pushy-server-cookbooks/opscode-pushy-server/resources/pg_sqitch.rb b/omnibus/files/pushy-server-cookbooks/opscode-pushy-server/resources/pg_sqitch.rb
@@ -7,4 +7,5 @@
 attribute :password,       kind_of: String, required: false, default: ""
 attribute :target_version, kind_of: String
 attribute :hostname,       kind_of: String, required: true
-attribute :port,           kind_of: Integer, required: true
+attribute :port,           kind_of: Integer, required: true
+attribute :sslmode,        kind_of: String, required: false, default: "prefer"