diff options
| author | Wouter den Breejen <uu@denbreejen.net> | 2009-03-22 15:32:28 +0000 |
|---|---|---|
| committer | Wouter den Breejen <uu@denbreejen.net> | 2009-03-22 15:32:28 +0000 |
| commit | eec829aad52a1fcb1ff9fbf89dbfa0d13dc55014 (patch) | |
| tree | 7fc36de73ba9eb3de774697535b2dcf21dc364c1 /pkgs/servers/ftp | |
| parent | ba1b5fe28cf3282fd6b6323863cb84dc92c91a14 (diff) | |
| download | nixpkgs-eec829aad52a1fcb1ff9fbf89dbfa0d13dc55014.tar nixpkgs-eec829aad52a1fcb1ff9fbf89dbfa0d13dc55014.tar.gz nixpkgs-eec829aad52a1fcb1ff9fbf89dbfa0d13dc55014.tar.bz2 nixpkgs-eec829aad52a1fcb1ff9fbf89dbfa0d13dc55014.tar.lz nixpkgs-eec829aad52a1fcb1ff9fbf89dbfa0d13dc55014.tar.xz nixpkgs-eec829aad52a1fcb1ff9fbf89dbfa0d13dc55014.tar.zst nixpkgs-eec829aad52a1fcb1ff9fbf89dbfa0d13dc55014.zip | |
vsftpd userlist options added
svn path=/nixpkgs/trunk/; revision=14649
Diffstat (limited to 'pkgs/servers/ftp')
| -rw-r--r-- | pkgs/servers/ftp/vsftpd/builder.sh | 9 | ||||
| -rw-r--r-- | pkgs/servers/ftp/vsftpd/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/ftp/vsftpd/vsftpd.user_list | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/servers/ftp/vsftpd/builder.sh b/pkgs/servers/ftp/vsftpd/builder.sh deleted file mode 100644 index 76f361d97b1..00000000000 --- 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 7961448428d..10e6d658714 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 00000000000..4200a1e9344 --- /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 |