public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed some variable names to follow the standard convention

Browse Source 
svn path=/nixos/trunk/; revision=10542
This commit is contained in:
Sander van der Burg 2008-02-07 13:37:20 +00:00
parent 76897682c4
commit 7fad8dc1b9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/options.nix
View File

@ -1373,7 +1373,7 @@
"; ";
}; };
anonymous_user = mkOption { anonymousUser = mkOption {
default = false; default = false;
description = " description = "
Whether to enable the anonymous FTP user. Whether to enable the anonymous FTP user.

2
upstart-jobs/default.nix
View File

@ -222,7 +222,7 @@ let
++ optional config.services.vsftpd.enable ++ optional config.services.vsftpd.enable
(import ../upstart-jobs/vsftpd.nix { (import ../upstart-jobs/vsftpd.nix {
inherit (pkgs) vsftpd; inherit (pkgs) vsftpd;
inherit (config.services.vsftpd) anonymous_user; inherit (config.services.vsftpd) anonymousUser;
}) })
# X Font Server # X Font Server

6
upstart-jobs/vsftpd.nix
View File

@ -1,4 +1,4 @@
{ vsftpd, anonymous_user }: { vsftpd, anonymousUser }:
{ {
name = "vsftpd"; name = "vsftpd";
@ -16,7 +16,7 @@
home = "/homeless-shelter"; home = "/homeless-shelter";
} }
] ++ ] ++
(if anonymous_user then [ (if anonymousUser then [
{ name = "ftp"; { name = "ftp";
uid = (import ../system/ids.nix).uids.ftp; uid = (import ../system/ids.nix).uids.ftp;
group = "ftp"; group = "ftp";
@ -36,7 +36,7 @@ stop on network-interfaces/stop
start script start script
cat > /etc/vsftpd.conf <<EOF cat > /etc/vsftpd.conf <<EOF
" + " +
(if anonymous_user then (if anonymousUser then
"anonymous_enable=YES" "anonymous_enable=YES"
else else
"anonymous_enable=NO") + "anonymous_enable=NO") +