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

nixos/tun2socks: init #348055

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

kaleocheng
Copy link
Contributor

Add service for https://github.com/xjasonlyu/tun2socks

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@kaleocheng
Copy link
Contributor Author

@SuperSandro2000 are you able to review this ?

cfg = config.services.tun2socks;
settingsFormat = pkgs.formats.yaml { };
in
with lib;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
with lib;

we don't do that anymore

User = cfg.user;
Group = cfg.group;
Type = "simple";
ExecStart = "${getBin cfg.package}/bin/tun2socks -config ${cfg.configFile}";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
ExecStart = "${getBin cfg.package}/bin/tun2socks -config ${cfg.configFile}";
ExecStart = "${lib.getExe getBin cfg.package} -config ${cfg.configFile}";

description = "Path to tun2socks YAML configuration file.";
};

package = mkOption {
Copy link
Member

Choose a reason for hiding this comment

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

Please use mkPackageOption


configFile = mkOption {
default = settingsFormat.generate "/var/lib/tun2socks/config.yaml" cfg.settings;
defaultText = "A tun2socks configuration file automatically generated by values from services.tun2socks.settings.*";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
defaultText = "A tun2socks configuration file automatically generated by values from services.tun2socks.settings.*";
defaultText = "A tun2socks configuration file automatically generated by values from services.tun2socks.settings";

@SuperSandro2000 SuperSandro2000 changed the title nixos.tun2socks: init nixos/tun2socks: init Oct 21, 2024
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.

3 participants