summary refs log tree commit diff
path: root/nixos/modules/services/web-apps/discourse.nix
diff options
context:
space:
mode:
authorKim Lindberger <kim.lindberger@gmail.com>2021-09-24 14:31:46 +0200
committerGitHub <noreply@github.com>2021-09-24 14:31:46 +0200
commit0686c40309b9fd8e078d91ecba3a6d499896e0aa (patch)
tree445a2ec1d391c435168db41eda224190609a755a /nixos/modules/services/web-apps/discourse.nix
parent1a6a4817e8264529e1e20fd47b88a19c9bfe03b4 (diff)
parentf933c68374b9c6195dc74d26c95fc9bf240fead8 (diff)
downloadnixpkgs-0686c40309b9fd8e078d91ecba3a6d499896e0aa.tar
nixpkgs-0686c40309b9fd8e078d91ecba3a6d499896e0aa.tar.gz
nixpkgs-0686c40309b9fd8e078d91ecba3a6d499896e0aa.tar.bz2
nixpkgs-0686c40309b9fd8e078d91ecba3a6d499896e0aa.tar.lz
nixpkgs-0686c40309b9fd8e078d91ecba3a6d499896e0aa.tar.xz
nixpkgs-0686c40309b9fd8e078d91ecba3a6d499896e0aa.tar.zst
nixpkgs-0686c40309b9fd8e078d91ecba3a6d499896e0aa.zip
Merge pull request #139180 from ryantm/dev/ryantm/discourse-tmp
discourse: enable restoring backups bigger than RAM
Diffstat (limited to 'nixos/modules/services/web-apps/discourse.nix')
-rw-r--r--nixos/modules/services/web-apps/discourse.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix
index 93298af2e3e..b28e3cf0deb 100644
--- a/nixos/modules/services/web-apps/discourse.nix
+++ b/nixos/modules/services/web-apps/discourse.nix
@@ -746,6 +746,8 @@ in
 
           umask u=rwx,g=rx,o=
 
+          rm -rf /var/lib/discourse/tmp/*
+
           cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/
           cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/
           ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads
@@ -767,7 +769,7 @@ in
           )
 
           discourse-rake db:migrate >>/var/log/discourse/db_migration.log
-          chmod -R u+w /run/discourse/tmp/
+          chmod -R u+w /var/lib/discourse/tmp/
 
           ${lib.optionalString (!cfg.admin.skipCreate) mkAdmin}
 
@@ -782,7 +784,6 @@ in
         RuntimeDirectory = map (p: "discourse/" + p) [
           "config"
           "home"
-          "tmp"
           "assets/javascripts/plugins"
           "public"
           "sockets"
@@ -791,6 +792,7 @@ in
         StateDirectory = map (p: "discourse/" + p) [
           "uploads"
           "backups"
+          "tmp"
         ];
         StateDirectoryMode = 0750;
         LogsDirectory = "discourse";