From: Ondřej Surý <ondrej@sury.org>
Date: Mon, 20 Sep 2021 10:44:49 +0000 (+0200)
Subject: Remove dnspriv example from the contrib directory
X-Git-Tag: v9.17.19~30^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b964e7882be02403160ff859772c7f31de1a8835;p=thirdparty%2Fbind9.git

Remove dnspriv example from the contrib directory

BIND 9 has now native DoH support, so there's no need to have nginx
proxy example in the contrib/ directory.
---

diff --git a/contrib/README b/contrib/README
index d02717b0364..0cdedc74a9c 100644
--- a/contrib/README
+++ b/contrib/README
@@ -8,11 +8,6 @@ be fixed as time permits.
       named and restarts it in the event of a crash, 'zone-edit'
       which enables editing of a dynamic zone, and others.
 
-    - dnspriv/
-
-      Sample configuration for setting up a DNS-over-TLS server
-      using BIND with Nginx as a TLS proxy.
-
     - kasp/
 
       Scripts for converting key and signature policies from OpenDNSSEC
diff --git a/contrib/dnspriv/README.md b/contrib/dnspriv/README.md
deleted file mode 100644
index 8fa67952089..00000000000
--- a/contrib/dnspriv/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- -
- - This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/.
- -
- - See the COPYRIGHT file distributed with this work for additional
- - information regarding copyright ownership.
--->
-### DNS Privacy in BIND
-
-This directory contains sample configuration files to enable BIND,
-with Nginx as a TLS proxy, to provide DNS over TLS.
-
-`named.conf` configures a validating recursive name server to listen
-on the localhost address at port 8853.
-
-`nginx.conf` configures a TLS proxy to listen on port 853 and
-forward queries and responses to `named`.
-
-For more information, please see
-[https://dnsprivacy.org/wiki/](https://dnsprivacy.org/wiki/)
diff --git a/contrib/dnspriv/named.conf b/contrib/dnspriv/named.conf
deleted file mode 100644
index 12d07a389b7..00000000000
--- a/contrib/dnspriv/named.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-	listen-on port 8853 { 127.0.0.1; };
-	allow-query { localhost; };
-	recursion yes;
-	dnssec-validation auto;
-	tcp-clients 1024;
-};
diff --git a/contrib/dnspriv/nginx.conf b/contrib/dnspriv/nginx.conf
deleted file mode 100644
index 763ff35f305..00000000000
--- a/contrib/dnspriv/nginx.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-# uncomment to choose an appropriate UID/GID; default is 'nobody'
-# user bind bind;
-
-worker_processes auto;
-pid /var/run/nginx.pid;
-
-events {
-    worker_connections 1024;
-    multi_accept on;
-}
-
-stream {
-    upstream dns_tcp_servers {
-	server 127.0.0.1:8853;
-    }
-
-    server {
-	listen 853 ssl;
-	proxy_pass dns_tcp_servers;
-
-	# update to a suitable SSL certificate (e.g. from LetsEncrypt),
-	# and uncomment the following lines:
-	# ssl_certificate       /etc/nginx/lego/certificates/<cert>.crt;
-	# ssl_certificate_key   /etc/nginx/lego/certificates/<cert>.key;
-
-	ssl_protocols         TLSv1.2;
-	ssl_ciphers           ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
-	ssl_session_tickets   on;
-	ssl_session_timeout   4h;
-	ssl_handshake_timeout 30s;
-    }
-}
diff --git a/util/copyrights b/util/copyrights
index 4d098720b69..1e81d475e7b 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -980,7 +980,6 @@
 ./contrib/dlz/modules/wildcard/README		X	2013,2018,2019,2020,2021
 ./contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c	X	2013,2015,2016,2018,2019,2020,2021
 ./contrib/dlz/modules/wildcard/testing/named.conf	X	2013,2018,2019
-./contrib/dnspriv/nginx.conf			SH	2017,2018,2019
 ./contrib/kasp/README				X	2020,2021
 ./contrib/kasp/kasp.xml				X	2020,2021
 ./contrib/kasp/policy.good			X	2020,2021