Fix some errors (service timouts and mastodon missing paths) after first reboot

diff --git a/virtual/modules/websites/tools/mastodon/default.nix b/virtual/modules/websites/tools/mastodon/default.nix
index b2170b50a4856ff4f6ca1c52fe755c73e2d36e09..d25a072967cd4eb2efddffde0d360fc7c45472b0 100644 (file)
--- a/virtual/modules/websites/tools/mastodon/default.nix
+++ b/virtual/modules/websites/tools/mastodon/default.nix
@@ -88,7 +88,7 @@ in {
         EnvironmentFile = mastodon.config;
         PrivateTmp = true;
         Restart = "always";
-        TimeoutSec = 15;
+        TimeoutSec = 60;
         Type = "simple";
         WorkingDirectory = mastodon.railsRoot;
       };
@@ -96,6 +96,7 @@ in {
       unitConfig.RequiresMountsFor = mastodon.varDir;
     };
 
+    # FIXME: monitor jobs
     systemd.services.mastodon-sidekiq = {
       description = "Mastodon Sidekiq";
       wantedBy = [ "multi-user.target" ];
@@ -104,7 +105,7 @@ in {
       environment.RAILS_ENV="production";
       environment.DB_POOL="5";
 
-      path = [ pkgs.bundler pkgs.file ];
+      path = [ pkgs.imagemagick pkgs.ffmpeg pkgs.bundler pkgs.file ];
 
       script = ''
         exec bundle exec sidekiq -c 5 -q default -q mailers -q pull -q push

diff --git a/virtual/modules/websites/tools/mastodon/mastodon.nix b/virtual/modules/websites/tools/mastodon/mastodon.nix
index e948852bec98c5a50902fb625c3fa3339687f3e1..9457a13a08e205da9ca79fa2e922708df536c759 100644 (file)
--- a/virtual/modules/websites/tools/mastodon/mastodon.nix
+++ b/virtual/modules/websites/tools/mastodon/mastodon.nix
@@ -2,6 +2,7 @@
 let
   varDir = "/var/lib/mastodon_immae";
   socketsDir = "/run/mastodon";
+  # FIXME: use gemsets and nodejs equivalent
   mastodon = stdenv.mkDerivation (fetchedGithub ./mastodon.json // rec {
     buildPhase = ''
       export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt

diff --git a/virtual/modules/websites/tools/mediagoblin/default.nix b/virtual/modules/websites/tools/mediagoblin/default.nix
index 4df7e53a51e64fe9a02a47ce27330fcf9c055b6a..388f6b3617867c7f65e9d4784fec8031f242c0ff 100644 (file)
--- a/virtual/modules/websites/tools/mediagoblin/default.nix
+++ b/virtual/modules/websites/tools/mediagoblin/default.nix
@@ -80,7 +80,7 @@ in {
         User = "mediagoblin";
         PrivateTmp = true;
         Restart = "always";
-        TimeoutSec = 15;
+        TimeoutSec = 60;
         Type = "simple";
         WorkingDirectory = mediagoblin.pythonRoot;
         PIDFile = "${mediagoblin.socketsDir}/mediagoblin-celeryd.pid";