diff options
| -rw-r--r-- | Makefile | 33 | ||||
| -rw-r--r-- | Makefile.inc.knot | 36 | ||||
| -rw-r--r-- | knot.conf.erb | 44 |
3 files changed, 0 insertions, 113 deletions
@@ -101,37 +101,6 @@ UNBOUND_PROCESS_FLAGS.turnera.le-fay.org= -Dtls=yes ####################################################################### -# Knot configuration for primary servers. -# - -# Global options. -KNOT_SERVERS?= \ - yarrow.le-fay.org \ - amaranth.le-fay.org \ - fuchsia.eden.le-fay.org - -KNOT_PROCESS_FLAGS= \ - -Dmaster=${MASTER} \ - -Dmaster_addr=${MASTER_ADDR} \ - -Dzones="${ZONES}" - -# Server-specific options. -KNOT_LISTEN.yarrow.le-fay.org= \ - 2a00:1098:6b:100::2@53 \ - 176.126.243.79@53 - -KNOT_LISTEN.amaranth.le-fay.org= \ - 2001:ba8:4015:100::2@53 \ - 185.73.44.74@53 - -KNOT_LISTEN.fuchsia.eden.le-fay.org= \ - 2001:8b0:aab5:4::9@53 \ - 81.187.47.195@53 \ - fd5b:a83:b06b:4::9@53 \ - fd5b:a83:b06b:600::5@53 - - -####################################################################### # The default target doesn't do anything. # @@ -140,14 +109,12 @@ all: @echo " make diff show diff between zone files and online zone" @echo " make update-zones update online zones" @echo " make unbound build and install Unbound configs" - @echo " make knot build and install Knot configs" .PHONY: all # Individual targets add dependencies to clean. clean: .PHONY: clean -.include "Makefile.inc.knot" .include "Makefile.inc.unbound" .include "Makefile.inc.zones" diff --git a/Makefile.inc.knot b/Makefile.inc.knot deleted file mode 100644 index 89d173a..0000000 --- a/Makefile.inc.knot +++ /dev/null @@ -1,36 +0,0 @@ -# This source code is released into the public domain. -# -# Make targets for Knot. - -KNOT_CONF_DIR=/usr/local/etc/knot -KNOT_CONF_FILE=${KNOT_CONF_DIR}/knot.conf - -knot: -.PHONY: knot - -.for server in ${KNOT_SERVERS} - -knot.conf.${server}: knot.conf.erb - ${.CURDIR}/bin/process \ - ${KNOT_PROCESS_FLAGS} \ - -Dlisten="${KNOT_LISTEN.${server}}" \ - ${KNOT_PROCESS_FLAGS.${server}} \ - $> $@ - -knot: knot-${server} -knot-${server}: knot.conf.${server} - @echo "" - @echo "===> updating ${server}" - @echo "" - scp -q $> root@${server}:${KNOT_CONF_FILE} - ssh root@${server} service knot restart - -.PHONY: update-knot-${server} - -clean: clean-knot-${server} -clean-knot-${server}: - rm -f ${.OBJDIR}/knot.conf.${server} -.PHONY: clean-knot-${server} - -.endfor - diff --git a/knot.conf.erb b/knot.conf.erb deleted file mode 100644 index 8f8c85a..0000000 --- a/knot.conf.erb +++ /dev/null @@ -1,44 +0,0 @@ -<%# vim:set noet ts=2 sw=2 sts=2: - # Standard knot.conf for a resolver. - -%> -server: - rundir: "/var/run/knot" - user: knot:knot - automatic-acl: off - version: "" - listen: [<%= listen.split.join(", ") %>] - -log: -- target: syslog - any: info - -database: - storage: "/var/db/knot" - -remote: -- id: master - address: <%= master_addr %> - -acl: -- id: allow-master - remote: master - action: notify - -# Response Rate Limiting -mod-rrl: -- id: default - rate-limit: 50 - slip: 2 - -template: -- id: default - storage: "/var/db/knot" - file: "%s.zone" - master: master - global-module: [mod-cookies, mod-rrl/default] - acl: [allow-master] - -zone: -- domain: catalog.invalid. - catalog-role: interpret - catalog-template: default |