Skip to content

Conversation

@DictXiong
Copy link
Member

@DictXiong DictXiong commented Oct 18, 2024

The old rpPPPoE package from Roaring Penguin is no longer maintained and the download link is also inaccessible. So I switch the upstream to https://github.com/dfskoll/rp-pppoe. Release note: https://github.com/dfskoll/rp-pppoe/blob/master/doc/CHANGES.

Also, according to the discussions in https://github.com/dfskoll/rp-pppoe/issues/32, it is strongly recommended to use rpPPPoE in the kernel mode, as it is more stable and performant than in the user mode. So I enable the compilation of the kernel mode plugin rp-pppoe.so. It will be available at /run/current-system/sw/lib/rp-pppoe.so.

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.

Working example

It functions as expected with the following configuration:

  sops.secrets."pppoe" = {
    # check https://github.com/Distrotech/rp-pppoe/blob/master/configs/pap-secrets for the format
    path = "/etc/ppp/pap-secrets";
    owner = "root";
    mode = "0600";
  };
  services.pppd = {
    enable = true;
    peers = {
      <a custom name> = {
        name = "<a custom name>";
        config = ''
          plugin /run/current-system/sw/lib/rp-pppoe.so
          nic-<physical interface name>
          user "<user name from the isp>"
          debug
          maxfail 0
          holdoff 5
          noipdefault
          defaultroute
          hide-password
          lcp-echo-interval 20
          lcp-echo-failure 3
          noauth
          persist
          noaccomp
          default-asyncmap
          nodetach
          nodeflate
          nopcomp
          novj
          novjccomp
        '';
      };
    };
  };

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Oct 18, 2024
@NixOSInfra NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label Oct 18, 2024
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Oct 18, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 10, 2024
@DictXiong DictXiong marked this pull request as draft November 11, 2024 09:58
@DictXiong DictXiong closed this Nov 11, 2024
@DictXiong DictXiong reopened this Nov 11, 2024
@DictXiong DictXiong marked this pull request as ready for review November 11, 2024 11:23
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 11, 2024
Copy link
Member

@FliegendeWurst FliegendeWurst left a comment

Choose a reason for hiding this comment

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

Would be good to squash the last two commits. LGTM otherwise

The old rpPPPoE package from Roaring Penguin is no longer maintained
and the download link is also inaccessible. So I switch the upstream
to https://github.com/dfskoll/rp-pppoe.

Also, according to the discussions in
https://github.com/dfskoll/rp-pppoe/issues/32, it is strongly
recommended to use rpPPPoE in the kernel mode, as it is more stable
and performant than in the user mode. So I enable the compilation of
the kernel mode plugin `rp-pppoe.so`. It will be available at
`/run/current-system/sw/lib/rp-pppoe.so`.
@DictXiong
Copy link
Member Author

DictXiong commented Nov 15, 2024

@FliegendeWurst Thanks for your reviews! I've squashed the last two commits.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 17, 2024
@misuzu misuzu merged commit d641ace into NixOS:master Dec 5, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants