selfoss (service): fix port in service config #50411
Merged
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
Mic92
reviewed
Nov 15, 2018
| @@ -21,7 +21,7 @@ let | |||
| db_database=${cfg.database.name} | |||
| db_username=${cfg.database.user} | |||
| db_password=${cfg.database.password} | |||
| db_port=${if (cfg.database.port != null) then cfg.database.port | |||
| db_port=${if (cfg.database.port != null) then (toString cfg.database.port) | |||
| else default_port} | |||
There was a problem hiding this comment.
I would use:
${toString (if (cfg.database.port != null) then cfg.database.port
else default_port)}
Then default_port has the same type as cfg.database.port
|
Is a backport required? |
rafaelgg
added a commit
to rafaelgg/nixpkgs
that referenced
this pull request
Nov 15, 2018
(cherry picked from commit 8bf4fe8)
Mic92
added a commit
that referenced
this pull request
Nov 15, 2018
selfoss (service): fix port in service config (backport of #50411)
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
The
services.selfoss.database.portoption has typetypes.nullOr types.int. However it is then used as a string, which makes even the default config fail. This change fixes that.Things done
sandboxinnix.confon non-NixOS)usingnix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)