summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-12-06 13:51:19 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-12-06 13:51:19 +0100
commitb681a83e8aa55b28c104e32acdbdb98fc3caf429 (patch)
treee58f9bee7980c096bfa8de701e50e74e598e8b69
parent466d11d87a18a85a97ba9ef7f1ee66ce5657f13d (diff)
downloadnixos-b681a83e8aa55b28c104e32acdbdb98fc3caf429.tar
nixos-b681a83e8aa55b28c104e32acdbdb98fc3caf429.tar.gz
nixos-b681a83e8aa55b28c104e32acdbdb98fc3caf429.tar.bz2
nixos-b681a83e8aa55b28c104e32acdbdb98fc3caf429.tar.xz
nixos-b681a83e8aa55b28c104e32acdbdb98fc3caf429.zip
-rw-r--r--ymir.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/ymir.nix b/ymir.nix
index c779201f..dc6fa19c 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -122,7 +122,7 @@ in rec {
122 122
123 printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}" 123 printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}"
124 ''; 124 '';
125 pam-pwdfile = pkgs.stdenv.mkDerivation rec { 125 pam_pwdfile = pkgs.stdenv.mkDerivation rec {
126 name = "pam-pwdfile-${version}"; 126 name = "pam-pwdfile-${version}";
127 version = "1.0"; 127 version = "1.0";
128 src = pkgs.fetchFromGitHub { 128 src = pkgs.fetchFromGitHub {
@@ -132,7 +132,7 @@ in rec {
132 sha256 = "0sjzwsnlf1g0xbingmjvb9gh8lnwzkkfzw10194ibnppdn4gy0zy"; 132 sha256 = "0sjzwsnlf1g0xbingmjvb9gh8lnwzkkfzw10194ibnppdn4gy0zy";
133 }; 133 };
134 134
135 buildInputs = [ pam ]; 135 buildInputs = with pkgs; [ pam ];
136 }; 136 };
137 }; 137 };
138 138
@@ -1005,7 +1005,7 @@ in rec {
1005 }; 1005 };
1006 1006
1007 security.pam.services."vsftpd".text = '' 1007 security.pam.services."vsftpd".text = ''
1008 auth required ${pkgs.pam-pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd 1008 auth required ${pkgs.pam_pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd
1009 account required pam_permit.so 1009 account required pam_permit.so
1010 ''; 1010 '';
1011} 1011}