nixpkgs/nixos/modules
Jamey Sharp d4e5748c1b nixos/openldap: fix assertion
In commit d43dc68db3, @Mic92 split the
rootpw option to allow specifying it in a file kept outside the Nix
store, as an alternative to specifying the password directly in the
config.

Prior to that, rootpw's type was `str`, but in order to allow both
alternatives, it had to become `nullOr str` with a default of `null`. So
I can see why this assertion, that either rootpw or rootpwFile are
specified, makes sense to add here.

However, these options aren't used if the configDir option is set, so as
written this assertion breaks valid configurations, including the
configuration used by nixos/tests/ldap.nix.

So this patch fixes the assertion so that it doesn't fire if configDir
is set.
2019-07-17 11:08:10 +03:00
..
config resolvconf service: init 2019-07-15 20:25:39 +03:00
hardware Merge pull request #63894 from ambrop72/no-opengl-xdg-data-dirs 2019-07-11 13:16:08 -04:00
i18n/input-method docs: format 2018-09-29 20:51:11 -04:00
installer nixos netboot: explicitly specify initrd 2019-07-15 19:33:21 +03:00
misc nixos/zabbixWeb: replace httpd subservice with new module 2019-07-11 18:45:46 -04:00
profiles nixos/hardened: harder inet defaults 2019-07-04 19:24:44 +02:00
programs nixos/captive-browser: fix module 2019-06-14 20:38:33 +02:00
security FIx some malformed XML in option descriptions 2019-05-13 09:15:17 +02:00
services nixos/openldap: fix assertion 2019-07-17 11:08:10 +03:00
system Merge pull request #62955 from abbradar/resolvconf 2019-07-17 11:07:12 +03:00
tasks Merge pull request #62955 from abbradar/resolvconf 2019-07-17 11:07:12 +03:00
testing nixos/test: remove the stateVersion statement from the test-instrumentation 2019-06-03 15:05:24 +02:00
virtualisation Merge pull request #61981 from ambrop72/no-opengl-ld-library-path 2019-07-11 13:15:51 -04:00
module-list.nix Merge pull request #62955 from abbradar/resolvconf 2019-07-17 11:07:12 +03:00
rename.nix Merge pull request #62955 from abbradar/resolvconf 2019-07-17 11:07:12 +03:00