From 7d2fd17dc70516d8971313dfe06f49727a4111ed Mon Sep 17 00:00:00 2001 From: sthen <> Date: Sun, 19 Jul 2015 17:31:21 +0000 Subject: [PATCH] remove code from unbound's rc script that generates control keys/certs if control-enable is used, our standard configuration is using unix domain sockets without certs. existing setups with already-created certificates are ok, if somebody needs remote+certs they can generate keys themself. ok florian@ --- src/etc/rc.d/unbound | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/etc/rc.d/unbound b/src/etc/rc.d/unbound index c591b0b1..378031b9 100644 --- a/src/etc/rc.d/unbound +++ b/src/etc/rc.d/unbound @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: unbound,v 1.2 2014/12/29 11:17:43 ajacoutot Exp $ +# $OpenBSD: unbound,v 1.3 2015/07/19 17:31:21 sthen Exp $ daemon="/usr/sbin/unbound" daemon_flags="-c /var/unbound/etc/unbound.conf" @@ -10,14 +10,6 @@ daemon_flags="-c /var/unbound/etc/unbound.conf" pexp="unbound${daemon_flags:+ ${daemon_flags}}" rc_pre() { - if grep '^[[:space:]]*control-enable:[[:space:]]*yes' \ - /var/unbound/etc/unbound.conf > /dev/null 2>&1 && \ - ! [[ -f /var/unbound/etc/unbound_server.key || - -f /var/unbound/etc/unbound_server.pem || - -f /var/unbound/etc/unbound_control.key || - -f /var/unbound/etc/unbound_control.pem ]]; then - /usr/sbin/unbound-control-setup 2> /dev/null - fi if grep '^[[:space:]]*auto-trust-anchor-file:' \ /var/unbound/etc/unbound.conf > /dev/null 2>&1; then /usr/sbin/unbound-anchor -v || true