jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
e4e8967269
nixpkgs/nixos/tests
History
aszlig 94bc38e6c1
nixos/bind: Allow to set extra options 
BIND doesn't allow the options section (or any section I'd guess) to be
defined more than once, so whenever you want to set an additional option
you're stuck using weird hacks like this:

services.bind.forwarders = lib.mkForce [ "}; empty-zones-enable no; #" ];

This basically exploits the fact that values coming from the module
options aren't escaped and thus works in a similar vain to how SQL
injection works.

Another option would be to just set configFile to a file that includes
all the options, including zones. That obviously makes the configuration
way less extensible and more awkward to use with the module system.

To make sure this change does work correctly I added a small test just
for that. The test could use some improvements, but better to have a
test rather than none at all. For a future improvement the test could be
merged with the NSD test, because both use the same zone file format.

This change has been reviewed in #40053 and after not getting any
opposition, I'm hereby adding this to master.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @peti, @edolstra
Closes: #40053
2018-05-30 05:07:39 +02:00
..
common nixos/tests/acme: fix on i686, improve timing (#40410) 2018-05-13 19:59:59 +02:00
hitch hitch: init at 1.4.8 + service + test (#39358) 2018-05-01 10:36:36 +01:00
hocker-fetchdocker hocker: Don't check package and wrap the binaries with PATH to nix 2017-12-02 09:20:22 -06:00
initrd-network-ssh nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
krb5 nixos/krb5: complete rewrite 2017-10-02 14:30:19 +10:30
kubernetes Kubernetes tests: increase the size of the VM from 700MB to 1.5GB 2018-05-25 11:10:15 +02:00
acme.nix nixos/tests/acme: fix on i686, improve timing (#40410) 2018-05-13 19:59:59 +02:00
ammonite.nix ammonite: add test 2017-07-04 21:36:30 -04:00
atd.nix nixos/tests/atd : remove test of batch command 2018-03-21 00:58:41 +01:00
avahi.nix avahi: fix test 2016-02-28 16:18:39 +01:00
beegfs.nix beegfs: init at 6.17 2017-12-31 07:07:02 +00:00
bind.nix nixos/bind: Allow to set extra options 2018-05-30 05:07:39 +02:00
bittorrent.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
blivet.nix blivet test: use python2 2016-11-24 22:28:03 +01:00
boot-stage1.nix nixos.tests.boot-stage1: fix missing libelf 2018-02-22 04:04:49 +01:00
boot.nix Fix installing the Nixpkgs channel on the installation media 2018-02-27 19:58:23 +01:00
borgbackup.nix nixos/borgbackup: init 2018-03-19 13:12:47 +01:00
buildbot.nix buildbot: 0.9.4 -> 0.9.5 2017-04-21 10:32:36 -04:00
cadvisor.nix cadvisor test: fix (#18671) 2016-09-16 22:06:16 +02:00
cassandra.nix cassandra service: init 2016-08-02 20:58:35 -04:00
ceph.nix nixos/ceph: init module (#35299) 2018-03-01 11:47:13 +00:00
chromium.nix nixos/tests/chromium: Wait 10s after new window 2018-04-28 17:35:13 +02:00
cjdns.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
cloud-init.nix nixos/tests: Drop unnecessary qemu-flags.nix include 2018-01-30 16:57:27 +02:00
containers-bridge.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
containers-extra_veth.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
containers-hosts.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
containers-imperative.nix nixos/tests: prevent stateVersion warnings in eval 2018-05-15 00:22:35 +02:00
containers-ipv4.nix nixos/tests: prevent stateVersion warnings in eval 2018-05-15 00:22:35 +02:00
containers-ipv6.nix replace ping6 with ping 2017-02-17 16:04:49 +01:00
containers-macvlans.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
containers-physical_interfaces.nix nixos/containers-physical_interfaces: use new bond option interface 2018-03-31 19:01:10 +01:00
containers-portforward.nix nixos-container: added test for port forwarding ( nixos/tests/containers-portforward.nix ) 2017-02-15 05:12:46 +01:00
containers-reloadable.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
containers-restart_networking.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
containers-tmpfs.nix nixos/tests/containers-tmpfs: fix test name 2018-03-12 22:28:27 +01:00
couchdb.nix nixos/tests: add couchdb test 2017-11-19 17:39:36 +01:00
deluge.nix deluge: add test 2018-04-13 10:30:22 +02:00
dhparams.nix nixos/dhparams: Add a defaultBitSize option 2018-05-07 04:58:52 +02:00
dnscrypt-proxy.nix nixos/dnscrypt-proxy: fix apparmor profile and test 2018-05-20 02:25:42 +02:00
docker-edge.nix docker: Add test for docker-edge, check for proper versions in tests 2017-09-04 19:02:44 -04:00
docker-registry.nix nixos/docker-registry: Add support for garbage collector to docker registry 2018-05-01 15:23:47 +02:00
docker-tools-overlay.nix docker-tools: add a test for permissions issues with AUFS/overlay 2018-04-14 14:11:14 +02:00
docker-tools.nix tests/docker-tools: Adds regression test for #34779 2018-05-24 12:23:51 -04:00
docker.nix docker: Add test for docker-edge, check for proper versions in tests 2017-09-04 19:02:44 -04:00
dovecot.nix dovecot module: test dovecot's LDA 2018-04-12 01:35:14 +02:00
ec2.nix nixos/tests: Drop unnecessary qemu-flags.nix include 2018-01-30 16:57:27 +02:00
ecryptfs.nix ecryptfs test: use TTY output to stabilize test 2016-12-02 19:36:27 -05:00
elk.nix elk: add elasticsearch6, logstash6, kibana6 and the beats at v6.1.0 2018-01-02 01:15:29 +01:00
emacs-daemon.nix Remove myself from maintainers 2017-01-31 11:00:14 +01:00
env.nix tests: Add environment 2017-09-05 19:05:37 -04:00
etcd-cluster.nix etcd-cluster: split up openssl commands 2016-09-03 13:59:28 +02:00
etcd.nix etcd module: add test for simple one node etcd service 2016-08-25 14:42:22 +02:00
ferm.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
firefox.nix nixos: tests: firefox: make more comprehensive 2017-03-15 17:25:57 +01:00
firewall.nix nixos: Fix ordering of firewall.service 2016-09-07 15:11:24 +02:00
flannel.nix flannel service: init 2016-10-01 17:08:48 +02:00
flatpak.nix nixos/flatpak: add test 2018-05-15 14:18:44 +02:00
fwupd.nix nixos/fwupd: add test 2018-02-15 01:11:13 +01:00
gdk-pixbuf.nix nixos/release.nix: add tests.gdk-pixbuf 2018-04-25 18:37:44 +02:00
gitlab.nix nixos/tests/gitlab.nix: Unbreak config, still times out 2017-11-06 14:52:33 +01:00
gitolite.nix nixos/tests/gitolite: Don't build during evaluation 2017-10-21 23:45:37 +03:00
gjs.nix nixos/gjs: add test 2018-02-14 22:43:59 +01:00
gnome3-gdm.nix nixos/tests/gnome3-gdm: fix broken test 2018-04-21 12:09:30 +02:00
gnome3.nix gnome3 tests: fix by providing more memory 2017-09-01 07:51:05 +02:00
gocd-agent.nix gocd-agent / gocd-server: Reduce test memory requirements so Hydra builds 2016-08-10 16:21:35 -04:00
gocd-server.nix gocd-agent / gocd-server: Reduce test memory requirements so Hydra builds 2016-08-10 16:21:35 -04:00
grafana.nix grafana: 5.0.0 -> 5.0.1 2018-03-12 23:37:29 +01:00
graphite.nix nixos/tests/graphite: fix test 2018-05-10 23:30:56 +02:00
haka.nix haka: very basic testing 2016-01-23 01:20:14 +01:00
hardened.nix nixos/tests/hardened: fix test (#40745) 2018-05-19 08:42:15 +02:00
hibernate.nix nixos/tests/hibernate: Fix netcat flags 2018-04-29 23:46:47 +02:00
home-assistant.nix nixos/tests/home-assistant: ignore "Timer got out of sync" error (#40735) 2018-05-18 23:06:25 +02:00
hound.nix hound: init module 2016-10-15 13:54:59 -04:00
hydra.nix nixos/hydra postgresql: Fix #27314 and add test case 2017-09-02 23:07:42 +02:00
i3wm.nix Fix X11 tests broken by the removal of -ac 2016-04-12 19:13:47 +02:00
iftop.nix nixos/iftop: add module 2018-04-07 15:06:51 +02:00
influxdb.nix cadvisor test: fix (#18671) 2016-09-16 22:06:16 +02:00
initrd-network.nix boot.initrd.network: Support DHCP 2016-02-02 19:59:27 +01:00
installer.nix nixos/tests/installer: Add lndir to extraDeps 2018-05-15 18:51:53 +02:00
ipfs.nix tests: ipfs: enable autoMount tests 2017-09-18 00:05:35 -07:00
ipv6.nix nixos/tests: fix test failure due to preferTempAddress changes 2018-02-19 11:31:20 +01:00
jenkins.nix nixos/tests/jenkins: check if jenkins is available 2017-12-14 16:03:24 +01:00
kafka.nix kafka: Add 1.1 2018-05-16 22:26:40 -04:00
kernel-copperhead.nix linux-copperhead: Fix test 2018-04-28 20:20:47 +00:00
kernel-latest.nix Add basic kernel tests 2017-09-05 10:38:07 -04:00
kernel-lts.nix Add basic kernel tests 2017-09-05 10:38:07 -04:00
kexec.nix all tests: added meta.maintainers section 2015-07-12 12:29:51 +02:00
keymap.nix nixos/tests/keymap: wait for xdotool to succeed 2018-04-25 10:16:52 +02:00
ldap.nix nixos/tests: add tests for the LDAP stack 2017-05-27 02:51:46 +02:00
leaps.nix nixos/tests/leaps.nix: fixed race condition 2017-03-06 21:33:21 +01:00
lightdm.nix Fix X11 tests broken by the removal of -ac 2016-04-12 19:13:47 +02:00
login.nix login test: Create and use direct reads of the TTY contents. 2016-11-30 00:17:18 -05:00
make-test.nix nixos/tests/make-test.nix: Fix eval error 2018-02-02 17:44:08 +01:00
mathics.nix nixos/mathics: New service and test 2016-01-02 14:34:55 -08:00
matrix-synapse.nix nixos/tests: add matrix-synapse test 2018-02-04 21:22:55 -04:00
mesos_test.py mesos: 1.0.1 -> 1.1.0 2016-12-29 20:09:46 -05:00
mesos.nix nixos/tests/mesos: wait for all services and ports 2018-05-11 19:26:35 +02:00
minio.nix minio: 20170613 -> 2017-09-29T19-16-56Z 2017-10-08 12:24:29 +02:00
misc.nix nixos/tests/misc: Fix on aarch64 2018-03-25 18:29:21 +03:00
mongodb.nix mongodb service: add test case 2016-09-17 10:47:36 +01:00
mpich-example.c
mumble.nix mumble: fix failing vm tests 2016-09-13 09:45:08 +02:00
munin.nix munin: fix tests by replacing cron with systemd timer 2017-03-22 00:16:36 +01:00
mutable-users.nix nixos/tests: Add a test for config.users.mutableUsers. 2017-11-19 19:11:19 +01:00
mysql-backup.nix nixos/tests/mysql-backup: fix non-deterministic failure (#40258) 2018-05-12 11:37:35 +02:00
mysql-replication.nix nixos/tests/mysql-replication: fix test (#40850) 2018-05-22 01:22:12 +02:00
mysql.nix nixos mysql: make start-up more robust (#41010) 2018-05-24 16:42:16 +02:00
nat.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
netdata.nix netdata service: fix permissions for apps.plugin 2018-01-02 17:57:19 -05:00
networking-proxy.nix all tests: added meta.maintainers section 2015-07-12 12:29:51 +02:00
networking.nix Merge pull request #27688 from rnhmjoj/routes 2018-02-19 14:12:58 +00:00
nexus.nix nixos/tests/nexus: fix for i686 (#40743) 2018-05-19 11:09:07 +02:00
nfs.nix nfs tests: fix nfs server unit name 2017-02-05 12:41:21 +03:00
nghttpx.nix nixos/nghttpx: add module for the nghttpx proxy server (#31680) 2017-11-16 18:21:02 +00:00
nginx.nix nixos/tests/nginx: fix name 2017-08-11 17:37:14 +02:00
nix-ssh-serve.nix nixos: nix.sshServe: Support ssh-ng. 2018-02-28 16:55:00 -05:00
novacomd.nix nixos: Add basic test of novacomd 2018-02-20 11:03:49 -06:00
nsd.nix nixos/nsd: Allow to configure root zone 2018-05-07 04:05:41 +02:00
openldap.nix nixos/tests/openldap: Fix name 2018-04-04 18:26:41 +03:00
openssh.nix nixos: nix.sshServe: Support ssh-ng. 2018-02-28 16:55:00 -05:00
osquery.nix nixos/osquery: add test 2018-04-30 16:49:38 +02:00
owncloud.nix owncloud: fix some but not all errors 2017-10-31 23:03:33 +01:00
pam-oath-login.nix pam_oath: require OATH and pam_unix credentials to be valid 2017-02-12 18:27:11 -05:00
partition.nix btrfsProgs -> canonical btrfs-progs 2016-01-03 20:38:44 +01:00
peerflix.nix all tests: added meta.maintainers section 2015-07-12 12:29:51 +02:00
pgjwt.nix nixos/tests: clean up pgjwt test 2017-10-04 13:04:49 +02:00
pgmanage.nix postage: replaced by pgmanage-10.0.2 2017-11-03 00:14:00 +01:00
phabricator.nix nixos/tests/phabricator: fix renaming warning 2017-03-03 07:26:17 -06:00
php-pcre.nix php: Add nixos test to ensure php-pcre works in httpd 2017-11-12 08:05:27 +01:00
plasma5.nix tests.plasma5: fix hash 2017-08-12 00:55:32 +02:00
plotinus.nix nixos/tests/plotinus: fix non-deterministic failure (#40239) 2018-05-10 19:38:02 +02:00
postgis.nix postgis: get rid of composableDerivation 2018-02-20 22:17:16 +01:00
postgresql.nix nixos tests: run postgresql tests with postgres user 2017-07-19 22:13:02 +01:00
powerdns.nix nixos/powerdns: add test 2018-02-17 16:43:41 +00:00
predictable-interface-names.nix nixos/tests/predictable-interface-names: Refactor 2018-04-29 15:36:56 +02:00
printing.nix cups service: fix client sockets 2018-02-23 18:51:39 +03:00
prometheus.nix nixos/tests: unbreak prometheus test 2017-10-16 20:31:49 +02:00
prosody.nix nixos/prosody: add a basic test 2018-03-21 15:33:58 +01:00
proxy.nix Make proxy test more robust 2015-08-31 18:36:32 +02:00
quagga.nix nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
quake3.nix rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
rabbitmq.nix all tests: added meta.maintainers section 2015-07-12 12:29:51 +02:00
radicale.nix nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1 2018-05-12 19:27:09 +00:00
riak.nix remove elrangR15 and riak 1.3.0 as they're outdated 2016-03-22 21:40:07 +00:00
rspamd.nix nixos/rspamd: options for worker configuration and socket activation 2018-02-09 06:19:03 +01:00
run-in-machine.nix nixos: Fix output path generation of runInMachine 2017-10-11 20:08:11 +02:00
rxe.nix nixos/rdma-core: add module for soft RoCE and test (#34607) 2018-02-10 07:52:03 +00:00
samba.nix samba test: fix race condition 2017-03-01 03:16:35 +03:00
sddm.nix nixos/tests/sddm: Fix detecting login screen 2017-06-22 06:26:08 +02:00
simple.nix nixos/tests/simple.nix: Include minimal.nix 2016-02-12 14:35:41 +01:00
slim.nix nixos: Add a VM test for the SLiM display manager 2017-04-23 19:25:27 +02:00
slurm.nix nixos/slurm: enable munge by default, added note to slurm description 2018-05-24 16:59:48 +02:00
smokeping.nix Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
snapper.nix snapper: add nixos module 2017-07-16 10:06:42 +01:00
ssh-keys.nix nixos: nix.sshServe: Support ssh-ng. 2018-02-28 16:55:00 -05:00
statsd.nix nixos/statsd: refactor test (#40554) 2018-05-16 18:03:55 +02:00
strongswan-swanctl.nix strongswan-swanctl: fix test 2018-02-28 11:44:00 +01:00
subversion.nix all tests: added meta.maintainers section 2015-07-12 12:29:51 +02:00
sudo.nix sudo: define extra rules in Nix language (#33905) 2018-01-17 14:56:08 +00:00
switch-test.nix nixos/system: make switch-to-configuration script pure. 2017-11-19 19:42:54 +01:00
systemd.nix nixos/test/systemd: fix broken test 2018-04-16 00:43:33 +02:00
taskserver.nix nixos/taskserver: Fix manual PKI management 2017-07-16 20:38:15 +02:00
testdb.sql mysqlBackup service: let it work with default settings 2017-09-27 18:44:49 +02:00
timezone.nix nixos/timezone: support imperative timezone configuration (#26608) 2017-07-31 15:55:24 +01:00
tomcat.nix Remove tomcat vm test timing issues 2016-09-13 22:46:46 +02:00
trac.nix postgresql92: remove last references 2017-09-05 18:20:56 +02:00
transmission.nix nixos/transmission: add basic nixos test 2018-04-05 22:07:49 +02:00
udisks2.nix nixos/tests/udisks2: Fix USB device hotplug 2018-04-30 03:02:57 +02:00
vault.nix vault: Fix test 2018-03-18 19:15:56 +00:00
virtualbox.nix nixos/tests/virtualbox: Work around test failures 2018-03-13 22:00:56 +01:00
wordpress.nix wordpress: security upgrade: 4.7.2 -> 4.7.3 & other improvements (#23837) 2017-03-14 16:11:51 +01:00
xautolock.nix xautolock: implement basic test to confirm functionality 2018-03-13 21:04:44 +01:00
xdg-desktop-portal.nix nixos/xdg-desktop-portal: add test 2018-05-15 14:18:44 +02:00
xfce.nix Add a regression test for #14623 2016-04-12 19:13:52 +02:00
xmonad.nix tests: xmonad less dependent on timings 2017-09-09 10:07:34 -04:00
xrdp.nix xrdp: init at 0.9.1 2017-04-29 17:23:35 +00:00
xss-lock.nix nixos/xsslock: wait until pgrep xlock succeeds (#40810) 2018-05-20 20:59:53 +02:00
yabar.nix yabar: add module 2018-01-04 09:58:21 +01:00
zfs.nix Add basic ZFS tests 2017-11-14 14:34:19 +08:00
zookeeper.nix zookeeper: Add simple test 2017-11-02 14:09:56 -04:00