nixpkgs/nixos/modules/services
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
..
admin cleanup redundant text in modules utilizing mkEnableOption 2019-04-20 14:44:02 +02:00
amqp nixos/rabbitmq: replace deprecated usage of PermissionsStartOnly 2019-04-13 07:00:57 -04:00
audio Merge pull request #63551 from Steell/roon-server 2019-07-02 10:06:29 +08:00
backup duplicati: fix StateDirectory 2019-06-27 14:15:37 +02:00
cluster treewide: remove unused variables (#63177) 2019-06-16 19:59:05 +00:00
computing nixos/boinc: replace deprecated usage of PermissionsStartOnly 2019-05-26 07:20:56 -04:00
continuous-integration treewide: Remove usage of isNull 2019-04-29 14:05:50 +02:00
databases nixos/openldap: fix assertion 2019-07-17 11:08:10 +03:00
desktops xfce4-13: rename to xfce4-14 2019-07-13 08:42:05 -03:00
development nixos/jupyter: wait for network.target 2018-11-06 20:40:20 +01:00
editors manual: mention jmacs as emacs imitation 2019-07-13 11:01:17 +02:00
games Merge pull request #60406 from JohnAZoidberg/remove-isnull 2019-05-18 09:36:24 +00:00
hardware treewide: use dontConfigure 2019-07-01 04:23:51 -04:00
logging nixos/graylog: use types.lines for extraConfig 2019-07-07 14:49:39 +02:00
mail Revert "Merge pull request #63156 from Izorkin/phpfpm-rootless" 2019-06-28 21:47:43 -04:00
misc nixos/redmine: add database.createLocally option (#63932) 2019-07-14 16:22:37 +02:00
monitoring nixos/grafana: add grafana user to group 'grafana' 2019-07-15 18:33:19 +02:00
network-filesystems nixos/doc: Fix spurious indentation 2019-06-17 12:28:26 +02:00
networking Merge pull request #62955 from abbradar/resolvconf 2019-07-17 11:07:12 +03:00
printing Merge pull request #59076 from Yarny0/cups-path-fix 2019-05-30 10:52:28 -04:00
scheduling Merge pull request #51918 from bobvanderlinden/var-run 2019-04-07 20:09:46 +02:00
search treewide: Remove usage of isNull 2019-04-29 14:05:50 +02:00
security nixos: add StateDirectory for fprintd 2019-05-26 18:06:46 +01:00
system Merge pull request #63204 from michaelpj/imp/localtime-upstream 2019-06-19 08:38:03 -04:00
torrent nixos/deluge: Add extractor dependencies. 2019-07-02 22:26:38 +01:00
ttys nixos: add preferLocalBuild=true; on derivations for config files 2019-02-22 20:11:27 +01:00
web-apps nixos/zabbixWeb: replace httpd subservice with new module 2019-07-11 18:45:46 -04:00
web-servers Merge pull request #63844 from aanderse/zabbix-cleanup 2019-07-12 06:12:51 -04:00
x11 Merge master into staging-next 2019-07-13 09:45:40 +02:00