From: Tom Hughes <tom@compton.nu>
Date: Sun, 15 Oct 2023 17:58:50 +0000 (+0100)
Subject: Stop trying to URI encode passwords
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/3c04971d911a23ee49937ffe47578f5c77bd1f39?ds=sidebyside

Stop trying to URI encode passwords
---

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index d2c94d1ed..1fe903022 100644
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
-require "uri"
-
 include_recipe "apt::postgresql"
 include_recipe "munin"
 include_recipe "prometheus"
@@ -141,7 +139,7 @@ clusters.each do |name, details|
       --collector.stat_wal_receiver
       --collector.statio_user_indexes
     ]
-    environment "DATA_SOURCE_NAME" => "postgres:///#{prometheus_database}?host=/run/postgresql&port=#{details[:port]}&user=prometheus&password=#{URI.encode_www_form_component(passwords['prometheus'])}"
+    environment "DATA_SOURCE_NAME" => "postgres:///#{prometheus_database}?host=/run/postgresql&port=#{details[:port]}&user=prometheus&password=#{passwords['prometheus']}"
     restrict_address_families "AF_UNIX"
     subscribes :restart, "template[/etc/prometheus/exporters/postgres_queries.yml]"
   end