movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/xl2tpd: prefer 'install' over 'chmod/chown' (#302388)

Browse source
This commit is contained in:
Felix Bühler 2024-10-27 19:21:21 +01:00 • committed by GitHub
commit 3f8d6caed2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
nixos/modules/services/networking/xl2tpd.nix
View file

@ -104,31 +104,18 @@ with lib;
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = '' preStart = ''
mkdir -p -m 700 /etc/xl2tpd install -m 700 -d /etc/xl2tpd/ppp
pushd /etc/xl2tpd > /dev/null [ -f /etc/xl2tpd/ppp/chap-secrets ] || install -m 600 -o root -g root /dev/stdin /etc/xl2tpd/ppp/chap-secrets <<EOF
mkdir -p -m 700 ppp
[ -f ppp/chap-secrets ] || cat > ppp/chap-secrets << EOF
# Secrets for authentication using CHAP # Secrets for authentication using CHAP
# client server secret IP addresses # client server secret IP addresses
#username xl2tpd password * #username xl2tpd password *
EOF EOF
chown root:root ppp/chap-secrets
chmod 600 ppp/chap-secrets
# The documentation says this file should be present but doesn't explain why and things work even if not there: # The documentation says this file should be present but doesn't explain why and things work even if not there:
[ -f l2tp-secrets ] || (echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) > l2tp-secrets [ -f /etc/xl2tpd/l2tp-secrets ] || install -m 600 -o root -g root <(echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) /etc/xl2tpd/l2tp-secrets
chown root:root l2tp-secrets
chmod 600 l2tp-secrets
popd > /dev/null install -m 701 -o root -g root -d /run/xl2tpd
mkdir -p /run/xl2tpd
chown root:root /run/xl2tpd
chmod 700 /run/xl2tpd
''; '';
serviceConfig = { serviceConfig = {