Skip to content

Commit

Permalink
feat(dev): disable pdns cache for e2e tests
Browse files Browse the repository at this point in the history
This commit also slightly shortens certain cache times for production, from
default to 20s.
  • Loading branch information
nils-wisiol authored and peterthomassen committed Apr 11, 2018
1 parent cfb8740 commit 6d65311
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docker-compose.test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ services:
networks:
front:
ipv4_address: ${DESECSTACK_IPV4_REAR_PREFIX16}.0.129 # make nslord available for test-e2e
environment:
- DESECSTACK_NSLORD_CACHE_TTL=0

static:
build: test/e2e/mock-static # build a mock static to save time executing tests
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ services:
- DESECSTACK_NSLORD_APIKEY
- DESECSTACK_NSLORD_CARBONSERVER
- DESECSTACK_NSLORD_CARBONOURNAME
- DESECSTACK_NSLORD_CACHE_TTL=20
depends_on:
- dblord
networks:
Expand Down
4 changes: 4 additions & 0 deletions nslord/conf/pdns.conf.var
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@ gmysql-dbname=pdns
gmysql-user=pdns
gmysql-password=${DESECSTACK_DBLORD_PASSWORD_pdns}
gmysql-dnssec=yes

cache-ttl=${DESECSTACK_NSLORD_CACHE_TTL}
negquery-cache-ttl=${DESECSTACK_NSLORD_CACHE_TTL}
query-cache-ttl=${DESECSTACK_NSLORD_CACHE_TTL}

0 comments on commit 6d65311

Please sign in to comment.