* One down, three to go.

svn path=/nixos/branches/modular-nixos/; revision=15784

modules/config/ldap.nix

@@ -57,19 +57,19 @@ mkIf config.users.ldap.enable {
 
       # Careful: OpenLDAP seems to be very picky about the indentation of
       # this file.  Directives HAVE to start in the first column!
-      { source = pkgs.writeText "ldap.conf" ''
-        uri ${config.users.ldap.server}
-        base ${config.users.ldap.base}
-        
-        ${
-        if config.users.ldap.useTLS then ''
-        ssl start_tls
-        tls_checkpeer no
-        '' else ""
-        }
-      '';
+      { source = pkgs.writeText "ldap.conf"
+          ''
+            uri ${config.users.ldap.server}
+            base ${config.users.ldap.base}
+
+            ${if config.users.ldap.useTLS then ''
+              ssl start_tls
+              tls_checkpeer no
+            '' else ""}
+          '';
         target = "ldap.conf";
       }
+      
     ];
   };
 

modules/legacy.nix

@@ -2,7 +2,6 @@
   require = [
     ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
-    ../upstart-jobs/ldap
     ../upstart-jobs/pcmcia.nix
   ];
 }

modules/module-list.nix

@@ -2,6 +2,7 @@
   ./config/fonts.nix
   ./config/guest-users.nix
   ./config/i18n.nix
+  ./config/ldap.nix
   ./config/networking.nix
   ./config/nsswitch.nix
   ./config/system-path.nix

upstart-jobs/ldap/ldap.conf.nix

@@ -1,18 +0,0 @@
-{writeText, config}:
-
-# Careful: OpenLDAP seems to be very picky about the indentation of
-# this file.  Directives HAVE to start in the first column!
-
-writeText "ldap.conf" "
-
-uri ${config.users.ldap.server}
-base ${config.users.ldap.base}
-  
-${
-if config.users.ldap.useTLS then "
-ssl start_tls
-tls_checkpeer no
-" else ""
-}
-
-"