From 4f1d5308171794a5216bf1820c398d75ddcdcdb7 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 6 Dec 2017 13:49:08 +0100 Subject: pull in pam-pwdfile --- ymir.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ymir.nix b/ymir.nix index bb6bc183..c3ca9892 100644 --- a/ymir.nix +++ b/ymir.nix @@ -122,7 +122,16 @@ in rec { printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}" ''; - + pam-pwdfile = pkgs.stdenv.mkDerivation rec { + name = "pam-pwdfile-${version}"; + version = "1.0"; + src = pkgs.fetchFromGitHub { + owner = "tiwe-de"; + repo = "libpam-pwdfile"; + rev = "v${version}"; + sha256 = "0sjzwsnlf1g0xbingmjvb9gh8lnwzkkfzw10194ibnppdn4gy0zy"; + }; + }; }; environment.systemPackages = with pkgs; [ @@ -994,7 +1003,7 @@ in rec { }; security.pam.services."vsftpd".text = '' - auth required pam_pwdfile.so pwdfile /srv/ftp.htpasswd + auth required ${pkgs.pam-pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd account required pam_permit.so ''; } -- cgit v1.2.3