From 259f647877fb89fd1c19b9c12b67b36ebf8336f6 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 4 Feb 2014 13:07:58 +0100 Subject: [PATCH] Remove unused sql_ro helpers --- files/gitlab-cookbooks/gitlab/libraries/chef_server.rb | 2 -- files/gitlab-cookbooks/gitlab/libraries/helper.rb | 4 ---- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb b/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb index 74a96cd..0da339a 100644 --- a/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb +++ b/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb @@ -48,7 +48,6 @@ module GitLab end GitLab['postgresql']['sql_password'] ||= generate_hex(50) - GitLab['postgresql']['sql_ro_password'] ||= generate_hex(50) if File.directory?("/etc/gitlab") File.open("/etc/gitlab/gitlab-secrets.json", "w") do |f| @@ -56,7 +55,6 @@ module GitLab Chef::JSONCompat.to_json_pretty({ 'postgresql' => { 'sql_password' => GitLab['postgresql']['sql_password'], - 'sql_ro_password' => GitLab['postgresql']['sql_ro_password'] }, }) ) diff --git a/files/gitlab-cookbooks/gitlab/libraries/helper.rb b/files/gitlab-cookbooks/gitlab/libraries/helper.rb index 7681da1..72d4b4c 100644 --- a/files/gitlab-cookbooks/gitlab/libraries/helper.rb +++ b/files/gitlab-cookbooks/gitlab/libraries/helper.rb @@ -38,10 +38,6 @@ class PgHelper user_exists?(node['gitlab']['postgresql']['sql_user']) end - def sql_ro_user_exists? - user_exists?(node['gitlab']['postgresql']['sql_ro_user']) - end - def user_exists?(db_user) psql_cmd(["-d 'template1'", "-c 'select usename from pg_user' -A", -- libgit2 0.21.2