nixos/tests/knot: Use automatic-acl and drop explicit acls
This is more in line with expected production usage and if people use this tests as a reference it should reflect that.
This commit is contained in:
parent
66579946d3
commit
1fc6f2c412
1 changed files with 5 additions and 15 deletions
|
@ -31,7 +31,7 @@ let
|
||||||
# DO NOT USE pkgs.writeText IN PRODUCTION. This put secrets in the nix store!
|
# DO NOT USE pkgs.writeText IN PRODUCTION. This put secrets in the nix store!
|
||||||
tsigFile = pkgs.writeText "tsig.conf" ''
|
tsigFile = pkgs.writeText "tsig.conf" ''
|
||||||
key:
|
key:
|
||||||
- id: slave_key
|
- id: xfr_key
|
||||||
algorithm: hmac-sha256
|
algorithm: hmac-sha256
|
||||||
secret: zOYgOgnzx3TGe5J5I/0kxd7gTcxXhLYMEq3Ek3fY37s=
|
secret: zOYgOgnzx3TGe5J5I/0kxd7gTcxXhLYMEq3Ek3fY37s=
|
||||||
'';
|
'';
|
||||||
|
@ -64,22 +64,17 @@ in {
|
||||||
server:
|
server:
|
||||||
listen: 0.0.0.0@53
|
listen: 0.0.0.0@53
|
||||||
listen: ::@53
|
listen: ::@53
|
||||||
|
automatic-acl: true
|
||||||
acl:
|
|
||||||
- id: slave_acl
|
|
||||||
address: 192.168.0.2
|
|
||||||
key: slave_key
|
|
||||||
action: transfer
|
|
||||||
|
|
||||||
remote:
|
remote:
|
||||||
- id: slave
|
- id: slave
|
||||||
address: 192.168.0.2@53
|
address: 192.168.0.2@53
|
||||||
|
key: xfr_key
|
||||||
|
|
||||||
template:
|
template:
|
||||||
- id: default
|
- id: default
|
||||||
storage: ${knotZonesEnv}
|
storage: ${knotZonesEnv}
|
||||||
notify: [slave]
|
notify: [slave]
|
||||||
acl: [slave_acl]
|
|
||||||
dnssec-signing: on
|
dnssec-signing: on
|
||||||
# Input-only zone files
|
# Input-only zone files
|
||||||
# https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3
|
# https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3
|
||||||
|
@ -122,21 +117,16 @@ in {
|
||||||
server:
|
server:
|
||||||
listen: 0.0.0.0@53
|
listen: 0.0.0.0@53
|
||||||
listen: ::@53
|
listen: ::@53
|
||||||
|
automatic-acl: true
|
||||||
acl:
|
|
||||||
- id: notify_from_master
|
|
||||||
address: 192.168.0.1
|
|
||||||
action: notify
|
|
||||||
|
|
||||||
remote:
|
remote:
|
||||||
- id: master
|
- id: master
|
||||||
address: 192.168.0.1@53
|
address: 192.168.0.1@53
|
||||||
key: slave_key
|
key: xfr_key
|
||||||
|
|
||||||
template:
|
template:
|
||||||
- id: default
|
- id: default
|
||||||
master: master
|
master: master
|
||||||
acl: [notify_from_master]
|
|
||||||
# zonefileless setup
|
# zonefileless setup
|
||||||
# https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2
|
# https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2
|
||||||
zonefile-sync: -1
|
zonefile-sync: -1
|
||||||
|
|
Loading…
Reference in a new issue