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

networking.wireguard: generate leaner units #299339

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

Conversation

teto
Copy link
Member

@teto teto commented Mar 26, 2024

Description of changes

Just a refacto to remove newlines from the ExecStart of the generated unit in systemctl cat wireguard-wg.service
Before:

$ cat /nix/store/shkicpczsrwlz2dyp6wg7k0sqxklzhif-unit-script-wireguard-wg-start/bin/wireguard-wg-start
#!/nix/store/5lr5n3qa4day8l1ivbwlcby2nknczqkq-bash-5.2p26/bin/bash
set -e
modprobe wireguard || true



ip link add dev "wg" type wireguard



ip address add "10.100.0.2/24" dev "wg"

wg set "wg" private-key "myredacted.key" listen-port "51820"

ip link set up dev "wg"


after

➜ cat /nix/store/47l9if51z4klh1lx6vfmkhjyr9jkpr71-unit-script-wireguard-wg-start/bin/wireguard-wg-start
#!/nix/store/5lr5n3qa4day8l1ivbwlcby2nknczqkq-bash-5.2p26/bin/bash
set -e

modprobe wireguard || true
ip link add dev "wg" type wireguard
ip address add "10.100.0.2/24" dev "wg"
wg set "wg" private-key "myredacted.key" listen-port "51820"
ip link set up dev "wg"

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@teto
Copy link
Member Author

teto commented Apr 3, 2024

@SEIAROTg since you've touched this recently

Copy link
Contributor

@SEIAROTg SEIAROTg left a comment

Choose a reason for hiding this comment

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

LGTM.

I feel the original string interpolation is slightly more readable though. Can we do something like this instead?

script = pipe ''
   # original code
'' [(split "\n+") (filter isString) (concatStringsSep "\n")]

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

3 participants