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.

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 provided database port in pgpass #851

Merged
merged 4 commits into from Dec 6, 2022

Conversation

teluq-pbrideau
Copy link
Contributor

Pull Request (PR) description

When configuring a postgresql database that is not running on port 5432, the .pgpass is not correctly configured.

Then, the exec { 'zabbix_server_create.sql':} does not succeed as the server could not connect to the database.

@smortex smortex added the bug Something isn't working label Nov 30, 2022
@@ -68,10 +68,12 @@
}
}

$db_port = pick($database_port, '5432')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of the pick, I think it makes sense to set $database_port to 5432 as default value?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the previously mentioned line 48 would be deleted, and the test adjusted like I pushed just now. Is it what you have in mind?

(I just figured out how the suggestion in github worked, I could have make a suggestion directly here, sorry!)

@teluq-pbrideau
Copy link
Contributor Author

I’ve squashed my commits to be cleaner, feel free to ask f you want me to squash it further

@bastelfreak
Copy link
Member

na it is fine the way it is :) lets see what CI says

@teluq-pbrideau
Copy link
Contributor Author

Well, the CI will surely crash because of renaming of template as i said in #854 (comment), so I’m sure I won’t have any green tick right now 😄

@smortex
Copy link
Member

smortex commented Dec 6, 2022

@teluq-pbrideau so, if we rebase this one on top of master it should pass 😀 ?

From your working directory:

git fetch origin       # Download the latest code we have here
git rebase origin/master # Move your commits on top of the main branch
git push -f            # Send the changes (-f is required because we re-wrote history)

@smortex smortex merged commit 767da95 into voxpupuli:master Dec 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants