git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #139180 from ryantm/dev/ryantm/discourse-tmp

discourse: enable restoring backups bigger than RAM

commit0686c40309b9fd8e078d91ecba3a6d499896e0aa authorKim Lindberger <kim.lindberger@gmail.com> dateFri 24 Sep 2021, 14:31 (5 years ago) parent1a6a481f933c68
2 files changed+5−3
nixos/modules/services/web-apps/discourse.nix+4−2 pkgs/servers/web-apps/discourse/default.nix+1−1
nixos/modules/services/web-apps/discourse.nix+4−2
@@ -746,6 +746,8 @@ in
746746
747747 umask u=rwx,g=rx,o=
748748
749+ rm -rf /var/lib/discourse/tmp/*
750+
749751 cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/
750752 cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/
751753 ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads
@@ -767,7 +769,7 @@ in
767769 )
768770
769771 discourse-rake db:migrate >>/var/log/discourse/db_migration.log
770− chmod -R u+w /run/discourse/tmp/
772+ chmod -R u+w /var/lib/discourse/tmp/
771773
772774 ${lib.optionalString (!cfg.admin.skipCreate) mkAdmin}
773775
@@ -782,7 +784,6 @@ in
782784 RuntimeDirectory = map (p: "discourse/" + p) [
783785 "config"
784786 "home"
785− "tmp"
786787 "assets/javascripts/plugins"
787788 "public"
788789 "sockets"
@@ -791,6 +792,7 @@ in
791792 StateDirectory = map (p: "discourse/" + p) [
792793 "uploads"
793794 "backups"
795+ "tmp"
794796 ];
795797 StateDirectoryMode = 0750;
796798 LogsDirectory = "discourse";
pkgs/servers/web-apps/discourse/default.nix+1−1
@@ -290,7 +290,7 @@ let
290290 cp -r . $out/share/discourse
291291 rm -r $out/share/discourse/log
292292 ln -sf /var/log/discourse $out/share/discourse/log
293− ln -sf /run/discourse/tmp $out/share/discourse/tmp
293+ ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp
294294 ln -sf /run/discourse/config $out/share/discourse/config
295295 ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins
296296 ln -sf /run/discourse/public $out/share/discourse/public