From 885e762d471e0733e5da72ddf10f486893624483 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Wed, 17 Jan 2018 11:00:15 +0100
Subject: nixos/matomo: improve serverName default when we need to change it
 anyway for the rename.

---
 nixos/doc/manual/release-notes/rl-1803.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'nixos/doc/manual')

diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 855045d6ce96..ddf812aae82f 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -255,6 +255,18 @@ following incompatible changes:</para>
             All files will be moved automatically on first startup, but you might need to adjust your backup scripts.
           </para>
         </listitem>
+        <listitem>
+          <para>
+            The default <option>serverName</option> for the nginx configuration changed from
+            <literal>piwik.${config.networking.hostName}</literal> to
+            <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal>
+            if <option>config.networking.domain</option> is set,
+            <literal>matomo.${config.networking.hostName}</literal> if it is not set.
+            If you change your <option>serverName</option>, remember you'll need to update the
+            <literal>trustedHosts[]</literal> array in <filename>/var/lib/matomo/config/config.ini.php</filename>
+            as well.
+          </para>
+        </listitem>
         <listitem>
           <para>
             The <literal>piwik</literal> user was renamed to <literal>matomo</literal>.
-- 
cgit 1.4.1