Merge pull request puppetlabs#297 from reidmv/fix_postgresql_conf_quo…

…te_logic Fix postgresql_conf quote logic
cegeka · Apr 3, 2014 · 1218791 · 1218791
2 parents e59a920 + 7b46af4
commit 1218791
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/puppet/provider/postgresql_conf/parsed.rb b/lib/puppet/provider/postgresql_conf/parsed.rb
@@ -18,7 +18,7 @@
     :to_line  => proc { |h|
 
       # simple string and numeric values don't need to be enclosed in quotes
-      dontneedquote = h[:value].match(/^(\w+|[0-9.-]+)$/)
+      dontneedquote = h[:value].match(/^(\w+)$/)
       dontneedequal = h[:name].match(/^(include|include_if_exists)$/i)
 
       str =  h[:name].downcase # normalize case

diff --git a/spec/acceptance/server/config_entry_spec.rb b/spec/acceptance/server/config_entry_spec.rb
@@ -23,4 +23,22 @@ class { 'postgresql::server': }
       expect(r.stderr).to eq('')
     end
   end
+
+  it 'should correctly set a quotes-required string' do
+    pp = <<-EOS.unindent
+      class { 'postgresql::server': }
+
+      postgresql::server::config_entry { 'listen_addresses':
+        value => '0.0.0.0',
+      }
+    EOS
+
+    apply_manifest(pp, :catch_failures => true)
+
+    psql('--command="show all" postgres') do |r|
+      r.stdout.should =~ /listen_adresses.+0\.0\.0\.0/
+      r.stderr.should be_empty
+      r.exit_code.should == 0
+    end
+  end
 end