Configuration adjustments for shaarli and mastodon

diff --git a/modules/private/websites/tools/tools/shaarli.nix b/modules/private/websites/tools/tools/shaarli.nix
index 24b4845480ec2aab69b089caa8017d1f606202b2..da8f734cb0b8082825a3587985f68948f2c09a85 100644 (file)
--- a/modules/private/websites/tools/tools/shaarli.nix
+++ b/modules/private/websites/tools/tools/shaarli.nix
@@ -60,6 +60,8 @@ in rec {
       "php_value[session.name]" = "ShaarliPHPSESSID";
       "php_admin_value[open_basedir]" = "${basedir}:/tmp";
       "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
+      "php_admin_value[upload_max_filesize]" = "200M";
+      "php_admin_value[post_max_size]" = "200M";
     };
   };
 }

diff --git a/modules/webapps/mastodon.nix b/modules/webapps/mastodon.nix
index 2f5a8e392027016791d7d3544b27d1ccbbb174a6..df2dbb23dac2a2eec289a037de296790071f3c1d 100644 (file)
--- a/modules/webapps/mastodon.nix
+++ b/modules/webapps/mastodon.nix
@@ -167,7 +167,7 @@ in
       environment.BUNDLE_GEMFILE = "${cfg.workdir.gems.confFiles}/Gemfile";
       environment.SOCKET = cfg.sockets.rails;
 
-      path = [ cfg.workdir.gems cfg.workdir.gems.ruby pkgs.file ];
+      path = [ cfg.workdir.gems cfg.workdir.gems.ruby pkgs.file pkgs.imagemagick ];
 
       preStart = ''
         install -m 0755 -d ${cfg.dataDir}/tmp/cache