summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-12-06 13:49:08 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-12-06 13:49:08 +0100
commit4f1d5308171794a5216bf1820c398d75ddcdcdb7 (patch)
tree59171138fbe40278146579692f860bcb03a7b7ee
parent4b040faf4f490ced545dcf10741e903c064ca78f (diff)
downloadnixos-4f1d5308171794a5216bf1820c398d75ddcdcdb7.tar
nixos-4f1d5308171794a5216bf1820c398d75ddcdcdb7.tar.gz
nixos-4f1d5308171794a5216bf1820c398d75ddcdcdb7.tar.bz2
nixos-4f1d5308171794a5216bf1820c398d75ddcdcdb7.tar.xz
nixos-4f1d5308171794a5216bf1820c398d75ddcdcdb7.zip
pull in pam-pwdfile
-rw-r--r--ymir.nix13
1 files 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 {
122 122
123 printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}" 123 printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}"
124 ''; 124 '';
125 125 pam-pwdfile = pkgs.stdenv.mkDerivation rec {
126 name = "pam-pwdfile-${version}";
127 version = "1.0";
128 src = pkgs.fetchFromGitHub {
129 owner = "tiwe-de";
130 repo = "libpam-pwdfile";
131 rev = "v${version}";
132 sha256 = "0sjzwsnlf1g0xbingmjvb9gh8lnwzkkfzw10194ibnppdn4gy0zy";
133 };
134 };
126 }; 135 };
127 136
128 environment.systemPackages = with pkgs; [ 137 environment.systemPackages = with pkgs; [
@@ -994,7 +1003,7 @@ in rec {
994 }; 1003 };
995 1004
996 security.pam.services."vsftpd".text = '' 1005 security.pam.services."vsftpd".text = ''
997 auth required pam_pwdfile.so pwdfile /srv/ftp.htpasswd 1006 auth required ${pkgs.pam-pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd
998 account required pam_permit.so 1007 account required pam_permit.so
999 ''; 1008 '';
1000} 1009}