docs: add GPL license to all 3 product docs

diff --git a/docs/common/license.rst b/docs/common/license.rst
new file mode 100644 (file)
index 0000000..081ca91
--- /dev/null
+++ b/docs/common/license.rst
@@ -0,0 +1,6 @@
+PowerDNS/dnsdist license
+========================
+
+We remind PowerDNS and dnsdist users that under the terms of the GNU General Public License, PowerDNS and dnsdist come with ABSOLUTELY NO WARRANTY.
+
+.. literalinclude:: ../../COPYING

diff --git a/docs/common/security-policy.rst b/docs/common/security-policy.rst
index dfb916dd728e9f8287579765958a6cbe9060fc27..3f457a9f4433cd5ca9fd54024d9aef1d2c72e26e 100644 (file)
--- a/docs/common/security-policy.rst
+++ b/docs/common/security-policy.rst
@@ -8,7 +8,7 @@ Please do not mail security issues to public lists, nor file a ticket, unless we
 We fully credit reporters of security issues, and respond quickly, but please allow us a reasonable timeframe to coordinate a response.
 
 We remind PowerDNS and dnsdist users that under the terms of the GNU General Public License, PowerDNS and dnsdist come with ABSOLUTELY NO WARRANTY.
-This license is included in this documentation.
+This :doc:`license <../common/license>`  is included in this documentation.
 
 If you believe you have found a security vulnerability that applies to DNS implementations generally, and you want to report this responsibly to a number of implementers, you might consider also using the `Open Source DNS Vulnerability mailing list <https://www.dns-oarc.net/oarc/oss-dns-vulns/>`_, managed by `DNS-OARC <https://www.dns-oarc.net/>`_.
 

diff --git a/docs/indexTOC.rst b/docs/indexTOC.rst
index a47aa950d6ddf25a271919476c92a6849a6fb95b..bad9bfcab980c7e72b7eb6266c69e6a1bed30b30 100644 (file)
--- a/docs/indexTOC.rst
+++ b/docs/indexTOC.rst
@@ -26,3 +26,4 @@ PowerDNS Authoritative Server
     security-advisories/index
     changelog/index
     appendices/*
+    common/license

diff --git a/pdns/dnsdistdist/docs/common b/pdns/dnsdistdist/docs/common
new file mode 120000 (symlink)
index 0000000..b115a64
--- /dev/null
+++ b/pdns/dnsdistdist/docs/common
@@ -0,0 +1 @@
+../../../docs/common
\ No newline at end of file

diff --git a/pdns/dnsdistdist/docs/conf.py b/pdns/dnsdistdist/docs/conf.py
index 232af4d268686f678af8082c80f146b7644539e8..8c2fa93214fd7e2e6888464f4bfd4d7fa3310dd1 100644 (file)
--- a/pdns/dnsdistdist/docs/conf.py
+++ b/pdns/dnsdistdist/docs/conf.py
@@ -70,7 +70,13 @@ language = None
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.venv']
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.venv',
+                    'http-api/override.rst',
+                    'common/zonemetadata.rst',
+                    'common/endpoint-servers-config.rst',
+                    'common/secpoll.rst',
+                    'common/api/*.rst',
+                    'common/tarball-pgp-keys.rst']
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'

diff --git a/pdns/dnsdistdist/docs/index_TOC.rst b/pdns/dnsdistdist/docs/index_TOC.rst
index efd140bc02790eb8426cf13814b451821fce6cd6..c1f893da55020a6b2ff3afa513d0fcb1297fe361 100644 (file)
--- a/pdns/dnsdistdist/docs/index_TOC.rst
+++ b/pdns/dnsdistdist/docs/index_TOC.rst
@@ -18,5 +18,6 @@ Table of Contents
    changelog
    upgrade_guide
    security-advisories/index
-   security-advisories/security-policy
+   common/security-policy
    glossary
+   common/license

diff --git a/pdns/dnsdistdist/docs/security-advisories/index.rst b/pdns/dnsdistdist/docs/security-advisories/index.rst
index 875c75010e8bafee229716146e2efe9d64842d6d..3d7391756922e610cbac3a9c5edfc9a309baf054 100644 (file)
--- a/pdns/dnsdistdist/docs/security-advisories/index.rst
+++ b/pdns/dnsdistdist/docs/security-advisories/index.rst
@@ -9,4 +9,4 @@ All security advisories for the DNSDist are listed here.
 
     powerdns-advisory-for-dnsdist*
 
-If you have a security problem to report, please see our :doc:`security policy <security-policy>`.
+If you have a security problem to report, please see our :doc:`security policy <../common/security-policy>`.

diff --git a/pdns/dnsdistdist/docs/security-advisories/security-policy.rst b/pdns/dnsdistdist/docs/security-advisories/security-policy.rst
deleted file mode 120000 (symlink)
index 2fbb491..0000000
--- a/pdns/dnsdistdist/docs/security-advisories/security-policy.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../../../docs/common/security-policy.rst
\ No newline at end of file

diff --git a/pdns/recursordist/docs/conf.py b/pdns/recursordist/docs/conf.py
index 68b28c784ab76c2a259b7f61ea3e4d2583792428..4a628ff187e9d5a5f7fb97cb9e88754500bd2cf9 100644 (file)
--- a/pdns/recursordist/docs/conf.py
+++ b/pdns/recursordist/docs/conf.py
@@ -73,7 +73,7 @@ language = None
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store',
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.venv',
                     'http-api/override.rst',
                     'common/zonemetadata.rst',
                     'common/endpoint-servers-config.rst',

diff --git a/pdns/recursordist/docs/indexTOC.rst b/pdns/recursordist/docs/indexTOC.rst
index 2f884b45a9e0a78cdf304212953624328372d552..2dabb3d88d92a4b08fcc0db1d59eb94619389655 100644 (file)
--- a/pdns/recursordist/docs/indexTOC.rst
+++ b/pdns/recursordist/docs/indexTOC.rst
@@ -22,4 +22,4 @@ PowerDNS Recursor
     upgrade
     changelog/index
     appendices/*
-
+    common/license