From eec829aad52a1fcb1ff9fbf89dbfa0d13dc55014 Mon Sep 17 00:00:00 2001 From: Wouter den Breejen <uu@denbreejen.net> Date: Sun, 22 Mar 2009 15:32:28 +0000 Subject: [PATCH] vsftpd userlist options added svn path=/nixpkgs/trunk/; revision=14649 --- pkgs/servers/ftp/vsftpd/builder.sh | 9 --------- pkgs/servers/ftp/vsftpd/default.nix | 9 +++++++-- pkgs/servers/ftp/vsftpd/vsftpd.user_list | 3 +++ 3 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 pkgs/servers/ftp/vsftpd/builder.sh create mode 100644 pkgs/servers/ftp/vsftpd/vsftpd.user_list diff --git a/pkgs/servers/ftp/vsftpd/builder.sh b/pkgs/servers/ftp/vsftpd/builder.sh deleted file mode 100644 index 76f361d97b10..000000000000 --- a/pkgs/servers/ftp/vsftpd/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -ensureDir "$out/bin" -ensureDir "$out/sbin" - -ensureDir "$out/man/man8" -ensureDir "$out/man/man5" - -genericBuild diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 7961448428dd..10e6d6587140 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { ''; patches = [ ./fix.patch ] ; - preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h''; - buildInputs = [ openssl libcap pam ]; + preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h; + sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c''; + + configFile = ./vsftpd.user_list; + postInstall = "cp ${./vsftpd.user_list} $out/vsftpd.user_list"; + + buildInputs = [ openssl libcap pam configFile ]; } diff --git a/pkgs/servers/ftp/vsftpd/vsftpd.user_list b/pkgs/servers/ftp/vsftpd/vsftpd.user_list new file mode 100644 index 000000000000..4200a1e93447 --- /dev/null +++ b/pkgs/servers/ftp/vsftpd/vsftpd.user_list @@ -0,0 +1,3 @@ +#list users here that can (not) connect to vsftpd (only needed when userlistenable=true) + +raidbackup