Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use configured port everywhere we talk to postgres #545

Merged
merged 2 commits into from
Oct 13, 2015
+7 −4
Merged

Use configured port everywhere we talk to postgres #545

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91bb39e
Use configured port everywhere we talk to postgres
Sep 24, 2015
b894d70
[omnibus] always specify postgresql port, even for local connections.
Oct 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use configured port everywhere we talk to postgres 
ChangeLog-Entry: Issue 459: Use configured port everywhere we talk to postgres
Marc Paradise committed Oct 13, 2015

Verified

This commit was signed with the committer’s verified signature. The key has expired.
domdfcoding Dominic Davis-Foster
GPG key ID: 3DCA8C2F52EC3292
Expired
Verified
Learn about vigilant mode
commit 91bb39e2d68474126c72324fa453ef6e6fe7b1b9
1 change: 1 addition & 0 deletions omnibus/files/private-chef-cookbooks/private-chef/templates/default/bootstrap-config.rb.erb
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ output_directory: '/tmp/opscode-platform-test'

db_driver: "postgres"
db_host: '<%= node['private_chef']['postgresql']['vip'] %>'
db_port: '<%= node['private_chef']['postgresql']['port'] %>'
db_user: '<%= node['private_chef']['opscode-erchef']['sql_user'] %>'
db_password: '<%= node['private_chef']['opscode-erchef']['sql_password'] %>'

2 changes: 1 addition & 1 deletion omnibus/files/private-chef-cookbooks/private-chef/templates/default/oc_erchef.config.erb
View file
Original file line number Diff line number Diff line change
@@ -198,7 +198,7 @@
{ip_mode, [ <%=PrivateChef['use_ipv6'] ? "ipv6,ipv4" : "ipv4" %> ] },
%% Database connection parameters
{db_host, "<%= node['private_chef']['postgresql']['vip'] %>"},
{db_port, 5432},
{db_port, <%= node['private_chef']['postgresql']['port'] %>},
{db_user, "<%= node['private_chef']['opscode-erchef']['sql_user'] %>"},
{db_pass, "<%= node['private_chef']['opscode-erchef']['sql_password'] %>"},
{db_name, "opscode_chef" },
2 changes: 1 addition & 1 deletion src/chef-server-bootstrap/bin/bootstrap-platform
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ class BootstrapPlatform
def bootstrap
config = YAML.load_file(@config_file)

db = Sequel.connect("#{config['db_driver']}://#{config['db_user']}:#{config['db_password']}@#{config['db_host']}/opscode_chef")
db = Sequel.connect("#{config['db_driver']}://#{config['db_user']}:#{config['db_password']}@#{config['db_host']}:#{config['db_port']}/opscode_chef")

#################################
# create superuser authz object #