From 7fad8dc1b96a797ae748adcc78497941a4d72fab Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 7 Feb 2008 13:37:20 +0000
Subject: [PATCH] Changed some variable names to follow the standard convention

svn path=/nixos/trunk/; revision=10542
---
 system/options.nix       | 2 +-
 upstart-jobs/default.nix | 2 +-
 upstart-jobs/vsftpd.nix  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index caa1ec4e19c..b3ccfa0b01e 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1373,7 +1373,7 @@
 	";
       };
       
-      anonymous_user = mkOption {
+      anonymousUser = mkOption {
         default = false;
 	description = "
 	  Whether to enable the anonymous FTP user.
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 83b36350338..a8d74d4c2fb 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -222,7 +222,7 @@ let
   ++ optional config.services.vsftpd.enable
     (import ../upstart-jobs/vsftpd.nix {
       inherit (pkgs) vsftpd;
-      inherit (config.services.vsftpd) anonymous_user;
+      inherit (config.services.vsftpd) anonymousUser;
     })
 
   # X Font Server
diff --git a/upstart-jobs/vsftpd.nix b/upstart-jobs/vsftpd.nix
index adbc3f82e61..67a11e77b2f 100644
--- a/upstart-jobs/vsftpd.nix
+++ b/upstart-jobs/vsftpd.nix
@@ -1,4 +1,4 @@
-{ vsftpd, anonymous_user }:
+{ vsftpd, anonymousUser }:
 
 {
   name = "vsftpd";
@@ -16,7 +16,7 @@
       home = "/homeless-shelter";
     }
   ] ++
-  (if anonymous_user then [
+  (if anonymousUser then [
     { name = "ftp";
       uid = (import ../system/ids.nix).uids.ftp;
       group = "ftp";
@@ -36,7 +36,7 @@ stop on network-interfaces/stop
 start script
     cat > /etc/vsftpd.conf <<EOF
 " + 
-    (if anonymous_user then 
+    (if anonymousUser then 
 "anonymous_enable=YES"
     else
 "anonymous_enable=NO") +