From aaa878ff7b86e77a8f9b1cb5a1025d74b1f64638 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sat, 9 May 2020 01:49:13 +0200
Subject: [PATCH] dms: proper dependencies and port setup

---
 configs/pepe/dms.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/configs/pepe/dms.nix b/configs/pepe/dms.nix
index d226519..3f87284 100644
--- a/configs/pepe/dms.nix
+++ b/configs/pepe/dms.nix
@@ -20,12 +20,17 @@ in {
     userlistEnable = true;
     localUsers = true;
     writeEnable = true;
+    extraConfig = ''
+      # additional ports for directory list and stuff
+      pasv_min_port=4242
+      pasv_max_port=4243
+    '';
   };
   networking.firewall.allowedTCPPortRanges = [
     {
-      # ftp
-      from = 1024;
-      to = 65535;
+      # ftp: additional ports for directory list and stuff
+      from = 4242;
+      to = 4243;
     }
     {
       # ftp
@@ -46,12 +51,12 @@ in {
     wantedBy = [ "multi-user.target" ];
     path = [
       (pkgs.python3.withPackages (ps: with ps; [ flask ]))
-      pkgs.imagemagick
-      pkgs.pdfsandwich
+      pkgs.imagemagickBig
+      (pkgs.pdfsandwich.override { imagemagick = pkgs.imagemagickBig; })
       pkgs.poppler_utils
       pkgs.which
-      pkgs.ghostscript
       pkgs.netpbm
+      pkgs.gawk
     ];
     serviceConfig = { User = "ftp-upload"; };
     preStart = ''