* One down, three to go.
svn path=/nixos/branches/modular-nixos/; revision=15784
This commit is contained in:
parent
107fc990a6
commit
19e0f46b0e
|
@ -57,19 +57,19 @@ mkIf config.users.ldap.enable {
|
||||||
|
|
||||||
# Careful: OpenLDAP seems to be very picky about the indentation of
|
# Careful: OpenLDAP seems to be very picky about the indentation of
|
||||||
# this file. Directives HAVE to start in the first column!
|
# this file. Directives HAVE to start in the first column!
|
||||||
{ source = pkgs.writeText "ldap.conf" ''
|
{ source = pkgs.writeText "ldap.conf"
|
||||||
uri ${config.users.ldap.server}
|
''
|
||||||
base ${config.users.ldap.base}
|
uri ${config.users.ldap.server}
|
||||||
|
base ${config.users.ldap.base}
|
||||||
${
|
|
||||||
if config.users.ldap.useTLS then ''
|
${if config.users.ldap.useTLS then ''
|
||||||
ssl start_tls
|
ssl start_tls
|
||||||
tls_checkpeer no
|
tls_checkpeer no
|
||||||
'' else ""
|
'' else ""}
|
||||||
}
|
'';
|
||||||
'';
|
|
||||||
target = "ldap.conf";
|
target = "ldap.conf";
|
||||||
}
|
}
|
||||||
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
require = [
|
require = [
|
||||||
../system/nixos-installer.nix
|
../system/nixos-installer.nix
|
||||||
../upstart-jobs/cron/locate.nix
|
../upstart-jobs/cron/locate.nix
|
||||||
../upstart-jobs/ldap
|
|
||||||
../upstart-jobs/pcmcia.nix
|
../upstart-jobs/pcmcia.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
./config/fonts.nix
|
./config/fonts.nix
|
||||||
./config/guest-users.nix
|
./config/guest-users.nix
|
||||||
./config/i18n.nix
|
./config/i18n.nix
|
||||||
|
./config/ldap.nix
|
||||||
./config/networking.nix
|
./config/networking.nix
|
||||||
./config/nsswitch.nix
|
./config/nsswitch.nix
|
||||||
./config/system-path.nix
|
./config/system-path.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 ""
|
|
||||||
}
|
|
||||||
|
|
||||||
"
|
|
Loading…
Reference in a new issue