break: wallabag is borked

modules/nixos/wallabag.nix

@@ -9,16 +9,26 @@ let
   configFile = pkgs.writeTextFile {
     name = "wallabag-config";
     text = cfg.conf;
-    destination = "/config/parameters.yml";
+    destination = "/app/config/parameters.yml";
   };
 
   appDir = pkgs.buildEnv {
     name = "wallabag-app-dir";
     ignoreCollisions = true;
     checkCollisionContents = false;
-    paths = [ configFile "${cfg.package}/app" ];
+    paths = [ configFile "${cfg.package}" ];
+    pathsToLink = [ "/app" "/src" "/translations" ];
   };
 
+  # See there for available commands:
+  # https://doc.wallabag.org/en/admin/console_commands.html
+  # A user can be made admin with the fos:user:promote --super <user> command
+  console = pkgs.writeShellScriptBin "wallabag-console" ''
+    export WALLABAG_DATA="${cfg.dataDir}"
+    cd "${cfg.dataDir}"
+    ${pkgs.php}/bin/php ${pkgs.wallabag}/bin/console --env=prod $@
+  '';
+
 in
 {
 
@@ -90,20 +100,24 @@ in
       user = "${cfg.user}";
       group = "nginx";
       phpPackage = pkgs.php;
+      phpEnv = {
+        WALLABAG_DATA = cfg.dataDir;
+        PATH = lib.makeBinPath [pkgs.php];
+      };
       settings = {
         "listen.owner" = "nginx";
         "listen.group" = "nginx";
         "listen.mode" = "0600";
         "user" = "${cfg.user}";
         "group" = "nginx";
-        "env[WALLABAG_DATA]" = "${cfg.dataDir}";
         "pm" = "dynamic";
         "pm.max_children" = "75";
         "pm.min_spare_servers" = "5";
         "pm.max_spare_servers" = "20";
         "pm.max_requests" = "10";
         "catch_workers_output" = "1";
-        "php_admin_value[error_log]" = "/var/log/nginx/${poolName}-phpfpm-error.log";
+        "php_admin_value[error_log]" = "stderr";
+        "php_admin_flag[log_errors]" = true;
       };
     };
     services.phpfpm.phpOptions = ''
@@ -111,6 +125,41 @@ in
     '';
 
     services.nginx.enable = mkDefault true;
+    environment.systemPackages = [ console ];
+
+    # services.nginx.virtualHosts."${cfg.hostName}" = {
+    #   forceSSL = false;
+    #   enableACME = false;
+    #   extraConfig = ''
+    #     error_log /var/log/nginx/wallabag_error.log;
+    #     access_log /var/log/nginx/wallabag_access.log;
+    #   '';
+
+    #   root = "${cfg.package}/web";
+    #   locations."/" = {
+    #     priority = 10;
+    #     tryFiles = "$uri /app.php$is_args$args";
+    #   };
+    #   locations."/assets".root = "${cfg.dataDir}/web";
+    #   locations."~ ^/app\\.php(/|$)" = {
+    #     priority = 100;
+    #     fastcgiParams = {
+    #       SCRIPT_FILENAME = "$realpath_root$fastcgi_script_name";
+    #       DOCUMENT_ROOT = "$realpath_root";
+    #     };
+    #     extraConfig = ''
+    #       fastcgi_pass unix:${config.services.phpfpm.pools."${poolName}".socket};
+    #       include ${config.services.nginx.package}/conf/fastcgi_params;
+    #       include ${config.services.nginx.package}/conf/fastcgi.conf;
+    #       internal;
+    #     '';
+    #   };
+    #   locations."~ \\.php$" = {
+    #     priority = 1000;
+    #     return = "404";
+    #   };
+    # };
+
 
     services.nginx.virtualHosts."${cfg.hostName}" = {
       enableACME = false;
@@ -124,23 +173,31 @@ in
       '';
 
       locations."/" = {
-        extraConfig = ''
-          try_files $uri /app.php$is_args$args;
-        '';
+        tryFiles = "$uri /app.php$is_args$args";
       };
 
       locations."/assets".root = "${cfg.dataDir}/web";
 
       locations."~ ^/app\\.php(/|$)" = {
+        fastcgiParams = {
+          SCRIPT_FILENAME = "$realpath_root$fastcgi_script_name";
+          DOCUMENT_ROOT = "$realpath_root";
+        };
         extraConfig = ''
           fastcgi_pass unix:${config.services.phpfpm.pools."${poolName}".socket};
-          fastcgi_split_path_info ^(.+\.php)(/.*)$;
-          include ${pkgs.nginx}/conf/fastcgi_params;
-          fastcgi_param SCRIPT_FILENAME ${cfg.package}/web/$fastcgi_script_name;
-          fastcgi_param DOCUMENT_ROOT ${cfg.package}/web;
-          fastcgi_read_timeout 120;
+          include ${config.services.nginx.package}/conf/fastcgi_params;
+          include ${config.services.nginx.package}/conf/fastcgi.conf;
           internal;
         '';
+        # extraConfig = ''
+        #   fastcgi_pass unix:${config.services.phpfpm.pools."${poolName}".socket};
+        #   fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        #   include ${pkgs.nginx}/conf/fastcgi_params;
+        #   fastcgi_param SCRIPT_FILENAME ${cfg.package}/web/$fastcgi_script_name;
+        #   fastcgi_param DOCUMENT_ROOT ${cfg.package}/web;
+        #   fastcgi_read_timeout 120;
+        #   internal;
+        # '';
       };
 
       locations."~ /(?!app)\\.php$" = {
@@ -174,8 +231,10 @@ in
         cd "${cfg.dataDir}"
 
         rm -rf var/cache/*
-        rm -f app
-        ln -sf ${appDir} app
+        rm -f app src translations
+        ln -sf ${appDir}/app app
+        ln -sf ${appDir}/src src
+        ln -sf ${appDir}/translations translations
         ln -sf ${cfg.package}/composer.{json,lock} .
 
         export WALLABAG_DATA="${cfg.dataDir}"