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

galene: init at 0.2 #109414

Merged
merged 1 commit into from Feb 2, 2021
Merged

galene: init at 0.2 #109414

merged 1 commit into from Feb 2, 2021

Conversation

rgrunbla
Copy link
Contributor

@rgrunbla rgrunbla commented Jan 14, 2021

Motivation for this change

Status: draft

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

Hi there. I have left some comments on the NixOS module that I hope you find helpful. Don't hesitate to ask for any clarification or help. Thanks!

nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

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

Only a minor change left and LGTM now.

nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
@RaitoBezarius
Copy link
Member

Result of nixpkgs-review pr 109414 1

1 package blacklisted:
  • tests.nixos-functions.nixos-test
1 package built:
  • galene

}
];

systemd.tmpfiles.rules = [ ]
Copy link
Member

Choose a reason for hiding this comment

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

I think there is still an improvement to be made here. Let me try to find some time for this on the weekend and I'll get back to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey, did you have the time to look at this ? Thanks !

Copy link
Member

Choose a reason for hiding this comment

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

I apologize, not yet. I still have plans to...

@rgrunbla rgrunbla marked this pull request as ready for review January 19, 2021 11:43
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

Sorry for the delay. I have left some comments, though I'm not sure how helpful they are. I hope at least some of them are... Let me know if you have any questions.

nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
description = "Enable Galene Service.";
};

stateDir = mkOption {
Copy link
Member

Choose a reason for hiding this comment

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

And do we actually need a stateDir option given all the others directory options? Maybe we can just hardcode /var/lib/galene because the other options exist.

Copy link
Contributor Author

@rgrunbla rgrunbla Jan 22, 2021

Choose a reason for hiding this comment

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

I feel it's good to let people decide where they want to put their state, and even if the other options exist, they default to reside in ${cfg.stateDir} which means you can change a single parameter (the stateDir) without having to change all of the other options.

Copy link
Member

Choose a reason for hiding this comment

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

Sorry, what I specifically meant is... are any files stored directly in cfg.stateDir, or are all files stored under the other directories specified by -data, -groups, -recordings, and -static? After looking at the upstream project for a few short minutes it looked like cfg.stateDir doesn't actually hold any files... it just happened to have the other specified directories in it.

I didn't test this, though... so please let me know if I'm wrong.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, no files are stored directly in cfg.stateDir but the other directories.

Copy link
Member

Choose a reason for hiding this comment

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

If the only directories stored in cfg.stateDir are already specified via other options then stateDir as an option is redundant... right? I guess it just means more typing because less defaults...

OK, take your pick. Either way works equally fine, just non technical irrelevant opinion on my part at this point I guess 😄

nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-apps/galene.nix Outdated Show resolved Hide resolved
@rgrunbla
Copy link
Contributor Author

Sorry for the delay. I have left some comments, though I'm not sure how helpful they are. I hope at least some of them are... Let me know if you have any questions.

No problem. I'm gonna mark some of these comments as "resolved" but i'll wait until I resolve them all to push.

Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

Great work on this! The module looks fantastic. After the minor points already mentioned are resolved I'm approving the module portion of this PR 👍

A NixOS test would be appreciated. Some people say it should be a hard requirement every module have a NixOS test, some people say it shouldn't. I'll mention that future PRs to this package or module will greatly benefit from a NixOS test, though. Committers can get nervous to hit "merge" if there is no test.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/456

@aanderse
Copy link
Member

aanderse commented Feb 1, 2021

/marvin opt-in
/status needs_reviewer

@SuperSandro2000 SuperSandro2000 merged commit e9876af into NixOS:master Feb 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants