From d57a4c96bbf15e72cef14c58906a2b4a26e7eca6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 7 Sep 2017 15:01:43 -0400
Subject: [PATCH] Clarify some points in docs

---
 docs/groupserver-install.rst |  2 ++
 docs/postfix-configure.rst   |  8 +++++
 docs/proxy-configure.rst     | 63 ++++++++++++++++++++++++------------
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/docs/groupserver-install.rst b/docs/groupserver-install.rst
index f4020eb..7abff2e 100644
--- a/docs/groupserver-install.rst
+++ b/docs/groupserver-install.rst
@@ -97,6 +97,8 @@ system, and finally `start Zope`_.
 .. index::
    pair: Configuration; Host name
 
+.. _Pick Hostname:
+
 Pick a host name
 ----------------
 
diff --git a/docs/postfix-configure.rst b/docs/postfix-configure.rst
index 5e12c1f..d6797d7 100644
--- a/docs/postfix-configure.rst
+++ b/docs/postfix-configure.rst
@@ -146,6 +146,14 @@ Ubuntu.
 
          smtpd_authorized_verp_clients = 127.0.0.1,localhost
 
+#.  Forward your mailing list domains to GroupServer by adding
+    them to the end of the
+    :file:`/etc/postfix/groupserver.virtual` file, like so
+
+      .. code-block:: cfg
+
+        @groups.example.com groupserver-automagic@localhost
+
 #.  Generate the Postfix hashes by running :command:`postmap` and
     :command:`postalias`:
 
diff --git a/docs/proxy-configure.rst b/docs/proxy-configure.rst
index 8efe1ad..d60cda7 100644
--- a/docs/proxy-configure.rst
+++ b/docs/proxy-configure.rst
@@ -184,11 +184,13 @@ text-editor.
       .. code-block:: nginx
 
         upstream gs {
-          server localhost:8080;
+          server gstest:8080;
         }
 
         server {
           listen 80;
+          listen [::]:80;
+
           server_name groups.example.com;
 
           location / {
@@ -196,31 +198,26 @@ text-editor.
             proxy_pass http://gs/;
             include proxy_params;
           }
-        }
-
-        server {
-          listen 80;
-          server_name zmi.groups.example.com;
 
-          location / {
+          location /manage {
             rewrite /(.*) /VirtualHostBase/http/$host:80/VirtualHostRoot/$1 break;
             proxy_pass http://gs/;
             include proxy_params;
           }
         }
 
-    * Two virtual sites are defined: one that presents
-      GroupServer (which is used most of the time) and one for
-      :ref:`the ZMI. <ZMI Login>`
+    * One virtual site is defined with two location blocks: one
+      that presents GroupServer (which is used most of the time)
+      and one for :ref:`the ZMI. <ZMI Login>`
 
-      + Change the ``server_name`` in the first ``server`` from
+      + Change the server name ``gstest`` in the ``upstream``
+        block to :ref:`the hostname you set for your site.
+        <Pick Hostname>`
+
+      + Change the ``server_name`` in the ``server`` block from
         ``groups.example.com`` to the address of you new virtual
         host.
 
-      + Change the host name for the ZMI, defined by the second
-        ``server`` from ``zmi.groups.example.com`` to that of
-        your new virtual host, keeping the ``zmi`` at the start.
-
 #.  Link the configuration for your host:
 
       .. code-block:: console
@@ -240,13 +237,27 @@ text-editor.
 Update the DNS
 ==============
 
-The service that supplies your domain-name should provide
-instructions for updating the domain name to point to your new
-:ref:`virtual host <virtual host>`. You will also need the domain
-for the ZMI to also point to the **same** server. You can either
+You will need to update your domain name's DNS records to point
+to the :ref:`virtual host(s) <virtual host>` you defined above.
+Your domain name registrar will provide you with instructions on
+how to accomplish this.
+
+If you configured ``groups.example.com`` as your virtual host,
+you will need to create DNS records that look like this:
+
+.. code-block:: cfg
+
+  groups  IN      A       123.123.123.123
+  groups  IN      AAAA    120f:120f:120f:120f:120f:120f:120f:120f
+
+If you configured the ZMI on a separate subdomain, you will also
+need to point it to the **same** server.
+
+.. code-block:: cfg
+
+  zmi.groups  IN      A       123.123.123.123
+  zmi.groups  IN      AAAA    120f:120f:120f:120f:120f:120f:120f:120f
 
-* Add a DNS entry for the ZMI, or
-* Add an entry to your local :file:`/etc/hosts` file.
 
 Change the reported port
 ========================
@@ -323,6 +334,8 @@ the following:
 
   server {
     listen 80;
+    listen [::]:80;
+
     server_name groups.example.com;
 
     return 301 https://$server_name$request_uri;
@@ -340,6 +353,8 @@ when you `add a virtual host`_, but
 
   server {
     listen 443;
+    listen [::]:443;
+
     server_name groups.example.com;
 
     ssl on;
@@ -351,6 +366,12 @@ when you `add a virtual host`_, but
       proxy_pass http://gs/;
       include proxy_params;
     }
+
+    location /manage {
+      rewrite /(.*) /VirtualHostBase/http/$host:80/VirtualHostRoot/$1 break;
+      proxy_pass http://gs/;
+      include proxy_params;
+    }
   }
 
 You can `change the skin`_ in the rewrite rule, just like before.