about summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2020-08-05 11:54:42 +0200
committerGitHub <noreply@github.com>2020-08-05 11:54:42 +0200
commit0bc37f7cb40dfde509000b22a9e8f5c231d5250e (patch)
tree33e1af3c41db64db37ebce81a2b15bb68c76c3f2 /nixos/doc
parent6cf131d54eee79c4e1012493b479bc6866c97aa1 (diff)
parent15b6edc4d1320d4b52e6d4222767cc145c940396 (diff)
Merge pull request #94609 from 1000101/dokuwiki
nixos/dokuwiki: drop SSL forcing and document incompatibility
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/release-notes/rl-2009.xml25
1 files changed, 25 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index a14ca76cf9b28..a3d9c11e520c6 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -593,6 +593,31 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
       When updating Graylog from a version before 3.3.3 make sure to check the Graylog <link xlink:href="https://www.graylog.org/post/announcing-graylog-v3-3-3">release info</link> for information on how to avoid the issue.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The <literal>dokuwiki</literal> module has changed to multi-instance, using submodules.
+     Therefore, it is now mandatory to name each instance. Moreover, forcing SSL by default has been dropped, so
+     <literal>nginx.forceSSL</literal> and <literal>nginx.enableACME</literal> are no longer set to <literal>true</literal>.
+     To continue using your service with the original SSL settings, you have to adjust the original config, e.g.:
+<programlisting>
+services.dokuwiki = {
+  enable = true;
+  ...
+};
+</programlisting>
+     To something similar:
+<programlisting>
+services.dokuwiki."mywiki" = {
+  enable = true;
+  nginx = {
+    forceSSL = true;
+    enableACME = true;
+  };
+  ...
+};
+</programlisting>
+    </para>
+   </listitem>
   </itemizedlist>
  </section>