3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos/modules/services/databases
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
..
4store-endpoint.nix
4store.nix
aerospike.nix
cassandra.nix nixos/cassandra: use cassandra's default cluster name "Test Cluster" 2019-06-18 00:36:46 +00:00
clickhouse.nix nixos/clickhouse: replace deprecated usage of PermissionsStartOnly 2019-04-13 07:00:58 -04:00
cockroachdb.nix treewide: Remove usage of isNull 2019-04-29 14:05:50 +02:00
couchdb.nix nixos/couchdb: replace deprecated usage of PermissionsStartOnly 2019-04-13 07:00:58 -04:00
firebird.nix nixos/firebird: replace deprecated usage of PermissionsStartOnly 2019-05-26 07:20:57 -04:00
foundationdb.nix nixos/foundationdb: s/pidFile/pidfile/ 2019-07-09 17:11:31 -05:00
foundationdb.xml doc: Use prompt more often 2019-06-17 13:25:50 +02:00
hbase.nix nixos/hbase: replace deprecated usage of PermissionsStartOnly 2019-05-26 07:20:54 -04:00
influxdb.nix nixos/influxdb: replace deprecated usage of PermissionsStartOnly 2019-04-13 07:00:59 -04:00
memcached.nix nixos/memcached: replace deprecated usage of PermissionsStartOnly 2019-04-13 07:00:55 -04:00
monetdb.nix
mongodb.nix mongodb: Add authentication support 2019-05-25 18:09:30 +09:00
mysql.nix nixos/mysql: make ExecStartPost script fail on error 2019-07-03 08:50:21 +02:00
neo4j.nix
openldap.nix nixos/openldap: fix assertion 2019-07-17 11:08:10 +03:00
opentsdb.nix
pgmanage.nix treewide: Remove usage of isNull 2019-04-29 14:05:50 +02:00
postgresql.nix Merge branch 'master' into postgresql-plugins-bin 2019-07-16 11:32:52 +03:00
postgresql.xml doc: Use prompt more often 2019-06-17 13:25:50 +02:00
redis.nix
rethinkdb.nix
riak-cs.nix
riak.nix
stanchion.nix nixos/stanchion: replace deprecated usage of PermissionsStartOnly 2019-04-13 07:00:57 -04:00
virtuoso.nix