Move virtual hosting to running.md

diff --git a/docs/markdown/authoritative/running.md b/docs/markdown/authoritative/running.md
index 3536fb1411867ae8fc1c56d04c6a403e9e5fe534..2d77e28578486dee88ab77798b1963380f204444 100644 (file)
--- a/docs/markdown/authoritative/running.md
+++ b/docs/markdown/authoritative/running.md
@@ -93,6 +93,31 @@ This will dump the config to standard out. Should you combine this with e.g. a
 [`launch`](settings.md#launch) statement (`pdns_server --launch=gpgsql --config`),
 all settings related to that backend (and their defaults) are included in the dump.
 
+# Virtual Hosting
+It may be advantageous to run multiple separate PowerDNS installations on a
+single host, for example to make sure that different customers cannot affect
+each others zones. PowerDNS fully supports running multiple instances on one host.
+
+To generate additional PowerDNS instances, copy the init.d script `pdns` to
+`pdns-name`, where `name` is the name of your virtual configuration. Must not
+contain a - as this will confuse the script.
+
+When you launch PowerDNS via this renamed script, it will seek configuration
+instructions not in `pdns.conf` but in `pdns-name.conf`, allowing for separate
+specification of parameters.
+
+Internally, the init script calls the binary with the
+[`config-name`](settings.md#config-name) option set to `name`, setting in motion
+the loading of separate configuration files.
+
+When you launch a virtual instance of PowerDNS, the pid-file is saved inside
+[`socket-dir`](settings.md#socket-dir) as `pdns-name.pid`.
+
+**Warning**: Be aware however that the init.d `force-stop` will kill all
+PowerDNS instances!
+
+**Warning**: For systems running systemd, virtual hosting is not yet supported.
+
 # Internals
 ## How PowerDNS translates DNS queries into backend queries
 A DNS query is not a straightforward lookup. Many DNS queries need to check the

diff --git a/docs/markdown/authoritative/settings.md b/docs/markdown/authoritative/settings.md
index cc9b02162953bae669d7a9aa8110ced5493f3dce..2cdd7e53861a9ea870e8dc3281bff4443c226072 100644 (file)
--- a/docs/markdown/authoritative/settings.md
+++ b/docs/markdown/authoritative/settings.md
@@ -145,7 +145,7 @@ this depends on `SYSCONFDIR` during compile-time.
 * String
 
 Name of this virtual configuration - will rename the binary image. See
-["Virtual hosting"](virtual.md).
+["Virtual hosting"](running.md#virtual-hosting).
 
 ## `control-console`
 Debugging switch - don't use.
@@ -739,7 +739,7 @@ compile-time (usually `/var/run` or `/run`). See
 
 This path will also contain the pidfile for this instance of PowerDNS called
 `pdns.pid` by default. See [`config-name`](#config-name) and
-[Virtual Hosting](virtual.md) how this can differ.
+[Virtual Hosting](running.md#virtual-hosting) how this can differ.
 
 ## `strict-rfc-axfrs`
 * Boolean

diff --git a/docs/markdown/authoritative/virtual.md b/docs/markdown/authoritative/virtual.md
deleted file mode 100644 (file)
index 422190b..0000000
--- a/docs/markdown/authoritative/virtual.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Virtual Hosting
-It may be advantageous to run multiple separate PowerDNS installations on a
-single host, for example to make sure that different customers cannot affect
-each others zones. PowerDNS fully supports running multiple instances on one host.
-
-To generate additional PowerDNS instances, copy the init.d script `pdns` to
-`pdns-name`, where `name` is the name of your virtual configuration. Must not
-contain a - as this will confuse the script.
-
-When you launch PowerDNS via this renamed script, it will seek configuration
-instructions not in `pdns.conf` but in `pdns-name.conf`, allowing for separate
-specification of parameters.
-
-Internally, the init script calls the binary with the
-[`config-name`](settings.md#config-name) option set to `name`, setting in motion
-the loading of separate configuration files.
-
-When you launch a virtual instance of PowerDNS, the pid-file is saved inside
-[`socket-dir`](settings.md#socket-dir) as `pdns-name.pid`.
-
-**Warning**: Be aware however that the init.d `force-stop` will kill all
-PowerDNS instances!
-
-**Warning**: For systems running systemd, virtual hosting is not yet supported.

diff --git a/docs/markdown/changelog.raw.md b/docs/markdown/changelog.raw.md
index b025640612f7c6eae40e5a0dc37112bd6f344ab4..19cb705a19a9b05896457def60af024f53c2358d 100644 (file)
--- a/docs/markdown/changelog.raw.md
+++ b/docs/markdown/changelog.raw.md
@@ -3118,7 +3118,7 @@ Developers: this version is compatible with 1.99.11 backends.
 -   Added a limit on the simultaneous numbers of TCP connections to accept (**max-tcp-connections**). Defaults to 10.
 
 ## Bugs fixed
--   When operating in virtual hosting mode (See [Virtual hosting](authoritative/virtual.md "Virtual hosting")), the additional init.d scripts would not function correctly and interface with other pdns instances.
+-   When operating in virtual hosting mode (See [Virtual hosting](authoritative/running.md#virtual-hosting "Virtual hosting")), the additional init.d scripts would not function correctly and interface with other pdns instances.
 -   PDNS neglected to conserve case on answers. So a query for WwW.PoWeRdNs.CoM would get an answer listing the address of www.powerdns.com. While this did not confuse resolvers, it is better to conserve case. This has semantic consequences for all backends, which the documentation now spells out.
 -   PostgreSQL backend was case sensitive and returned only answers in case an exact match was found. The Generic PostgreSQL backend is now officially all lower case and zone2sql in PostgreSQL mode enforces this. Documentation has been been updated to reflect the case change. Thanks to Maikel Verheijen of Ladot for spotting this!
 -   Documentation bug - postgresql create/index statements created a duplicate index. If you've previously copy pasted the commands and not noticed the error, execute **CREATE INDEX rec\_name\_index ON records(name)** to remedy. Thanks to Jeff Miller for reporting this. This also lead to depressingly slow 'ANY' lookups for those of you doing benchmarks.

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 294dadf1b50f00f7d68f2f5a5753c4f2e9a799b0..440faf305460408621ac8bdf9247dc747b370bc4 100644 (file)
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -26,7 +26,6 @@ pages:
     - Dynamic DNS Update: authoritative/dnsupdate.md
     - Using TSIG for AXFR: authoritative/tsig.md
     - Various How To's: authoritative/howtos.md
-    - Virtual Hosting: authoritative/virtual.md
     - Performance Tuning and Monitoring: authoritative/performance.md
     - Migrating to PowerDNS: authoritative/migration.md
     - Recursion with the Authoritative Server: authoritative/recursion.md