Upgrade mastodon

[perso/Immae/Config/Nix.git] / modules / webapps / mastodon.nix

diff --git a/modules/webapps/mastodon.nix b/modules/webapps/mastodon.nix
index f8fbcbaf4e2bec0045297d25a25d2b8c870168cd..26d5238f118968878e1c0c920a9d1c0992a10ac3 100644 (file)
--- a/modules/webapps/mastodon.nix
+++ b/modules/webapps/mastodon.nix
@@ -163,6 +163,7 @@ in
       path = [ cfg.workdir.gems cfg.workdir.gems.ruby pkgs.file ];
 
       preStart = ''
+        install -m 0755 -d ${cfg.dataDir}/tmp/cache
         ./bin/bundle exec rails db:migrate
       '';
 
@@ -170,6 +171,9 @@ in
         exec ./bin/bundle exec puma -C config/puma.rb
       '';
 
+      postStart = ''
+        exec ./bin/tootctl cache clear
+        '';
       serviceConfig = {
         User = cfg.user;
         EnvironmentFile = cfg.configFile;
@@ -218,12 +222,5 @@ in
       unitConfig.RequiresMountsFor = cfg.dataDir;
     };
 
-    system.activationScripts.mastodon = {
-      deps = [ "users" ];
-      text = ''
-      install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}/tmp/cache
-      '';
-    };
-
   };
 }