mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 12:15:34 +03:00
4f0dadbf38
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
128 lines
3.4 KiB
Nix
128 lines
3.4 KiB
Nix
{
|
|
config,
|
|
pkgs,
|
|
lib,
|
|
...
|
|
}:
|
|
|
|
with lib;
|
|
|
|
{
|
|
options = {
|
|
services.pptpd = {
|
|
enable = mkEnableOption "pptpd, the Point-to-Point Tunneling Protocol daemon";
|
|
|
|
serverIp = mkOption {
|
|
type = types.str;
|
|
description = "The server-side IP address.";
|
|
default = "10.124.124.1";
|
|
};
|
|
|
|
clientIpRange = mkOption {
|
|
type = types.str;
|
|
description = "The range from which client IPs are drawn.";
|
|
default = "10.124.124.2-11";
|
|
};
|
|
|
|
maxClients = mkOption {
|
|
type = types.int;
|
|
description = "The maximum number of simultaneous connections.";
|
|
default = 10;
|
|
};
|
|
|
|
extraPptpdOptions = mkOption {
|
|
type = types.lines;
|
|
description = "Adds extra lines to the pptpd configuration file.";
|
|
default = "";
|
|
};
|
|
|
|
extraPppdOptions = mkOption {
|
|
type = types.lines;
|
|
description = "Adds extra lines to the pppd options file.";
|
|
default = "";
|
|
example = ''
|
|
ms-dns 8.8.8.8
|
|
ms-dns 8.8.4.4
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
|
|
config = mkIf config.services.pptpd.enable {
|
|
systemd.services.pptpd =
|
|
let
|
|
cfg = config.services.pptpd;
|
|
|
|
pptpd-conf = pkgs.writeText "pptpd.conf" ''
|
|
# Inspired from pptpd-1.4.0/samples/pptpd.conf
|
|
ppp ${ppp-pptpd-wrapped}/bin/pppd
|
|
option ${pppd-options}
|
|
pidfile /run/pptpd.pid
|
|
localip ${cfg.serverIp}
|
|
remoteip ${cfg.clientIpRange}
|
|
connections ${toString cfg.maxClients} # (Will get harmless warning if inconsistent with IP range)
|
|
|
|
# Extra
|
|
${cfg.extraPptpdOptions}
|
|
'';
|
|
|
|
pppd-options = pkgs.writeText "ppp-options-pptpd.conf" ''
|
|
# From: cat pptpd-1.4.0/samples/options.pptpd | grep -v ^# | grep -v ^$
|
|
name pptpd
|
|
refuse-pap
|
|
refuse-chap
|
|
refuse-mschap
|
|
require-mschap-v2
|
|
require-mppe-128
|
|
proxyarp
|
|
lock
|
|
nobsdcomp
|
|
novj
|
|
novjccomp
|
|
nologfd
|
|
|
|
# Extra:
|
|
${cfg.extraPppdOptions}
|
|
'';
|
|
|
|
ppp-pptpd-wrapped = pkgs.stdenv.mkDerivation {
|
|
name = "ppp-pptpd-wrapped";
|
|
phases = [ "installPhase" ];
|
|
nativeBuildInputs = with pkgs; [ makeWrapper ];
|
|
installPhase = ''
|
|
mkdir -p $out/bin
|
|
makeWrapper ${pkgs.ppp}/bin/pppd $out/bin/pppd \
|
|
--set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \
|
|
--set NIX_REDIRECTS "/etc/ppp=/etc/ppp-pptpd"
|
|
'';
|
|
};
|
|
in
|
|
{
|
|
description = "pptpd server";
|
|
|
|
requires = [ "network-online.target" ];
|
|
wantedBy = [ "multi-user.target" ];
|
|
|
|
preStart = ''
|
|
mkdir -p -m 700 /etc/ppp-pptpd
|
|
|
|
secrets="/etc/ppp-pptpd/chap-secrets"
|
|
|
|
[ -f "$secrets" ] || install -m 600 -o root -g root /dev/stdin "$secrets" << EOF
|
|
# From: pptpd-1.4.0/samples/chap-secrets
|
|
# Secrets for authentication using CHAP
|
|
# client server secret IP addresses
|
|
#username pptpd password *
|
|
EOF
|
|
'';
|
|
|
|
serviceConfig = {
|
|
ExecStart = "${pkgs.pptpd}/bin/pptpd --conf ${pptpd-conf}";
|
|
KillMode = "process";
|
|
Restart = "on-success";
|
|
Type = "forking";
|
|
PIDFile = "/run/pptpd.pid";
|
|
};
|
|
};
|
|
};
|
|
}
|