forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Implement simple Nginx configuration #1
Closed
michaelshmitty
wants to merge
10
commits into
martinetd:cryptpad
from
michaelshmitty:martinetd-cryptpad
Closed
Implement simple Nginx configuration #1
michaelshmitty
wants to merge
10
commits into
martinetd:cryptpad
from
michaelshmitty:martinetd-cryptpad
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
cryptpad removed its dependency on bower and can be sanely packaged again. Add the package back, as a brand new package. The httpAddress setting was ignored and forcefully fixed; the alternate port setting is also broken but fondamentally useless for us so leave broken in nixpkgs. Link: cryptpad/cryptpad#295
This is a full rewrite that also manages the configs (cryptpad's config and nixos's) for easier maintainance. The cryptpad's example nginx config is pretty horrible and this can probably be improved. Other areas probably also can be improved, but this sticks to cryptpad defaults for now.
Add some hardening. The systemd confinement setting isn't common in nixos so make it optional. Test hasn't changed: the same test runs both with and without confinement.
@martinetd I think I figured out how to open a PR for some extra commits for you to look at. I will start adding them here. Feel free to take or leave what you want. You probably want to sync your master branch with NixOS/nixpkgs because I've already rebased this onto latest. |
11 tasks
michaelshmitty
force-pushed
the
martinetd-cryptpad
branch
4 times, most recently
from
December 19, 2023 12:48
597b313
to
61e1488
Compare
It's inside the mkIf cfg.nginx.enable block so it will never be false
Taking inspiration from the [Mastodon NixOS module](https://github.com/NixOS/nixpkgs/blob/nixos-23.11/nixos/modules/services/web-apps/mastodon.nix)
michaelshmitty
force-pushed
the
martinetd-cryptpad
branch
from
December 19, 2023 12:51
61e1488
to
73e025a
Compare
martinetd
force-pushed
the
cryptpad
branch
11 times, most recently
from
July 24, 2024 07:16
88e5de7
to
dc4d108
Compare
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.
Description of changes
These commits contain some suggestions / improvements to eventually go into NixOS#251687