Fix locally created database #56889
Merged
Fix locally created database #56889
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Move initialDatabases directive from the 'ensureUsers' scope to the correct outer 'mysql' one.
When database.createLocally is used, a mysql user is created with the ensureUsers directive. It ensures that the unix user with the name provided exists and can connect to MySQL through socket. Thus, the MySQL username used by php/perl scripts must match the unix user owning the server PID. This patch sets the default mysql to 'zoneminder' instead of 'zmuser'.
GrahamcOfBorg
added
6.topic: nixos
danbst
suggested changes
Mar 9, 2019
| @@ -49,7 +49,7 @@ let | |||
| # Database | |||
| ZM_DB_TYPE=mysql | |||
| ZM_DB_HOST=${cfg.database.host} | |||
| ZM_DB_NAME=${cfg.database.name} | |||
| ZM_DB_NAME=${if cfg.database.createLocally user else cfg.database.name} | |||
There was a problem hiding this comment.
There is syntax problem here - then is missing. I guess this particular change wasn't tested somehow.
There was a problem hiding this comment.
Yup, sorry about that. Will fix that asap, thanks for looking into it.
Fix syntax error and use the correct variable (cfg.database.username) when not creating the db locally.
GrahamcOfBorg
added
10.rebuild-darwin: 0
10 tasks
amazari
added a commit
to amazari/nixpkgs
that referenced
this pull request
Mar 9, 2019
PR messed up db and use naming NixOS#56889 while fixing the scope of the initialDatabases property. This patch fixes the issue.
amazari
added a commit
to amazari/nixpkgs
that referenced
this pull request
Mar 9, 2019
PR NixOS#56889 messed up db and use naming while fixing the scope of the initialDatabases property. This patch fixes the issue.
10 tasks
| @@ -49,7 +49,7 @@ let | |||
| # Database | |||
| ZM_DB_TYPE=mysql | |||
| ZM_DB_HOST=${cfg.database.host} | |||
| ZM_DB_NAME=${cfg.database.name} | |||
| ZM_DB_NAME=${if cfg.database.createLocally then user else cfg.database.username} | |||
There was a problem hiding this comment.
Why? Why would you want a different user when having zoneminder create the database?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
In its current form the database.createLocally flag is broken. Those patches try to fix it.
Things done
Ping @peterhoeg
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)