summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorKim Lindberger <kim.lindberger@gmail.com>2021-08-17 22:56:55 +0200
committerGitHub <noreply@github.com>2021-08-17 22:56:55 +0200
commit7f857f1c32580c056d3b09758f0196a2acae962d (patch)
tree9df96a0e122d21cc5e46df901685e6cfa772cae4 /nixos/modules/services
parent1594c64eac18e4bb2526a8a3820e9cb6bacfa160 (diff)
parent12ff4b79e48d9c4aa5660d2ec7ce52a21806d8e4 (diff)
downloadnixpkgs-7f857f1c32580c056d3b09758f0196a2acae962d.tar
nixpkgs-7f857f1c32580c056d3b09758f0196a2acae962d.tar.gz
nixpkgs-7f857f1c32580c056d3b09758f0196a2acae962d.tar.bz2
nixpkgs-7f857f1c32580c056d3b09758f0196a2acae962d.tar.lz
nixpkgs-7f857f1c32580c056d3b09758f0196a2acae962d.tar.xz
nixpkgs-7f857f1c32580c056d3b09758f0196a2acae962d.tar.zst
nixpkgs-7f857f1c32580c056d3b09758f0196a2acae962d.zip
Merge pull request #133611 from talyz/discourse-2.7.7
discourse: 2.7.5 -> 2.7.7, plugin updates and fixes
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/web-apps/discourse.nix1
-rw-r--r--nixos/modules/services/web-apps/discourse.xml13
2 files changed, 12 insertions, 2 deletions
diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix
index 8d5302ba267..050e4ee3d32 100644
--- a/nixos/modules/services/web-apps/discourse.nix
+++ b/nixos/modules/services/web-apps/discourse.nix
@@ -771,7 +771,6 @@ in
           "tmp"
           "assets/javascripts/plugins"
           "public"
-          "plugins"
           "sockets"
         ];
         RuntimeDirectoryMode = 0750;
diff --git a/nixos/modules/services/web-apps/discourse.xml b/nixos/modules/services/web-apps/discourse.xml
index 1d6866e7b35..184c9c6363e 100644
--- a/nixos/modules/services/web-apps/discourse.xml
+++ b/nixos/modules/services/web-apps/discourse.xml
@@ -284,12 +284,23 @@ services.discourse = {
       Ruby dependencies are listed in its
       <filename>plugin.rb</filename> file as function calls to
       <literal>gem</literal>. To construct the corresponding
-      <filename>Gemfile</filename>, run <command>bundle
+      <filename>Gemfile</filename> manually, run <command>bundle
       init</command>, then add the <literal>gem</literal> lines to it
       verbatim.
     </para>
 
     <para>
+      Much of the packaging can be done automatically by the
+      <filename>nixpkgs/pkgs/servers/web-apps/discourse/update.py</filename>
+      script - just add the plugin to the <literal>plugins</literal>
+      list in the <function>update_plugins</function> function and run
+      the script:
+      <programlisting language="bash">
+./update.py update-plugins
+</programlisting>.
+    </para>
+
+    <para>
       Some plugins provide <link
       linkend="module-services-discourse-site-settings">site
       settings</link>. Their defaults can be configured using <xref