Replace myPhpfpm with correct overrides

5 files changed, 90 insertions, 63 deletions

diff --git a/nixops/modules/websites/tools/cloud.nix b/nixops/modules/websites/tools/cloud.nix
index 5e010f4..5d2ca40 100644
--- a/nixops/modules/websites/tools/cloud.nix
+++ b/nixops/modules/websites/tools/cloud.nix
@@ -17,7 +17,6 @@ let
       zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
       '';
     pool = ''
-      listen = ${socket}
       user = wwwrun
       group = wwwrun
       listen.owner = wwwrun
@@ -170,9 +169,10 @@ in {
       ln -s ${nextcloud} $out/webapps/${webappName}
       '';
 
-    services.myPhpfpm = {
-      poolPhpConfigs.nextcloud = phpFpm.phpConfig;
-      poolConfigs.nextcloud = phpFpm.pool;
+    services.phpfpm.pools.nextcloud = {
+      listen = phpFpm.socket;
+      extraConfig = phpFpm.pool;
+      phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig;
     };
 
     services.cron = {
diff --git a/nixops/modules/websites/tools/dav/default.nix b/nixops/modules/websites/tools/dav/default.nix
index 075cf48..78e0ba3 100644
--- a/nixops/modules/websites/tools/dav/default.nix
+++ b/nixops/modules/websites/tools/dav/default.nix
@@ -41,7 +41,7 @@ in {
       ];
     };
 
-    services.myPhpfpm.poolConfigs = {
+    services.phpfpm.poolConfigs = {
       davical = davical.phpFpm.pool;
     };
 
diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix
index 064d3dd..495c5ea 100644
--- a/nixops/modules/websites/tools/git/default.nix
+++ b/nixops/modules/websites/tools/git/default.nix
@@ -38,7 +38,7 @@ in {
           ''
       ];
     };
-    services.myPhpfpm.poolConfigs = {
+    services.phpfpm.poolConfigs = {
       mantisbt = mantisbt.phpFpm.pool;
     };
   };
diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 061c004..642755f 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -72,15 +72,6 @@ in {
       ++ ldap.apache.modules
       ++ kanboard.apache.modules;
 
-    systemd.services.ympd = {
-      description = "Standalone MPD Web GUI written in C";
-      wantedBy = [ "multi-user.target" ];
-      script = ''
-        export MPD_PASSWORD=$(cat /var/secrets/mpd)
-        ${pkgs.ympd}/bin/ympd --host ${ympd.config.host} --port ${toString ympd.config.port} --webport ${ympd.config.webPort} --user nobody
-        '';
-    };
-
     services.websites.integration.vhostConfs.devtools = {
       certName    = "eldiron";
       addToCerts  = true;
@@ -157,33 +148,99 @@ in {
       ];
     };
 
-    services.myPhpfpm.serviceDependencies = {
-      dokuwiki = dokuwiki.phpFpm.serviceDeps;
-      kanboard = kanboard.phpFpm.serviceDeps;
-      ldap = ldap.phpFpm.serviceDeps;
-      rainloop = rainloop.phpFpm.serviceDeps;
-      roundcubemail = roundcubemail.phpFpm.serviceDeps;
-      shaarli = shaarli.phpFpm.serviceDeps;
-      ttrss = ttrss.phpFpm.serviceDeps;
-      wallabag = wallabag.phpFpm.serviceDeps;
-      yourls = yourls.phpFpm.serviceDeps;
+    systemd.services = {
+      phpfpm-dokuwiki = {
+        after = lib.mkAfter dokuwiki.phpFpm.serviceDeps;
+        wants = dokuwiki.phpFpm.serviceDeps;
+      };
+      phpfpm-kanboard = {
+        after = lib.mkAfter kanboard.phpFpm.serviceDeps;
+        wants = kanboard.phpFpm.serviceDeps;
+      };
+      phpfpm-ldap = {
+        after = lib.mkAfter ldap.phpFpm.serviceDeps;
+        wants = ldap.phpFpm.serviceDeps;
+      };
+      phpfpm-rainloop = {
+        after = lib.mkAfter rainloop.phpFpm.serviceDeps;
+        wants = rainloop.phpFpm.serviceDeps;
+      };
+      phpfpm-roundcubemail = {
+        after = lib.mkAfter roundcubemail.phpFpm.serviceDeps;
+        wants = roundcubemail.phpFpm.serviceDeps;
+      };
+      phpfpm-shaarli = {
+        after = lib.mkAfter shaarli.phpFpm.serviceDeps;
+        wants = shaarli.phpFpm.serviceDeps;
+      };
+      phpfpm-ttrss = {
+        after = lib.mkAfter ttrss.phpFpm.serviceDeps;
+        wants = ttrss.phpFpm.serviceDeps;
+      };
+      phpfpm-wallabag = {
+        after = lib.mkAfter wallabag.phpFpm.serviceDeps;
+        wants = wallabag.phpFpm.serviceDeps;
+        preStart = lib.mkAfter wallabag.phpFpm.preStart;
+      };
+      phpfpm-yourls = {
+        after = lib.mkAfter yourls.phpFpm.serviceDeps;
+        wants = yourls.phpFpm.serviceDeps;
+      };
+      ympd = {
+        description = "Standalone MPD Web GUI written in C";
+        wantedBy = [ "multi-user.target" ];
+        script = ''
+          export MPD_PASSWORD=$(cat /var/secrets/mpd)
+          ${pkgs.ympd}/bin/ympd --host ${ympd.config.host} --port ${toString ympd.config.port} --webport ${ympd.config.webPort} --user nobody
+          '';
+      };
+      tt-rss = {
+        description = "Tiny Tiny RSS feeds update daemon";
+        serviceConfig = {
+          User = "wwwrun";
+          ExecStart = "${pkgs.php}/bin/php ${ttrss.webRoot}/update.php --daemon";
+          StandardOutput = "syslog";
+          StandardError = "syslog";
+          PermissionsStartOnly = true;
+        };
+
+        wantedBy = [ "multi-user.target" ];
+        requires = ["postgresql.service"];
+        after = ["network.target" "postgresql.service"];
+      };
+    };
+
+    services.phpfpm.pools.roundcubemail = {
+      listen = roundcubemail.phpFpm.socket;
+      extraConfig = roundcubemail.phpFpm.pool;
+      phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig;
     };
 
-    services.myPhpfpm.poolPhpConfigs = {
-      devtools = ''
+    services.phpfpm.pools.devtools = {
+      listen = "/var/run/phpfpm/devtools.sock";
+      extraConfig = ''
+        user = wwwrun
+        group = wwwrun
+        listen.owner = wwwrun
+        listen.group = wwwrun
+        pm = dynamic
+        pm.max_children = 60
+        pm.start_servers = 2
+        pm.min_spare_servers = 1
+        pm.max_spare_servers = 10
+
+        php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"
+        '';
+      phpOptions = config.services.phpfpm.phpOptions + ''
         extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
         extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
         zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
         '';
-      roundcubemail = roundcubemail.phpFpm.phpConfig;
-    };
-    services.myPhpfpm.preStart = {
-      wallabag = wallabag.phpFpm.preStart;
     };
-    services.myPhpfpm.poolConfigs = {
+
+    services.phpfpm.poolConfigs = {
       adminer = adminer.phpFpm.pool;
       ttrss = ttrss.phpFpm.pool;
-      roundcubemail = roundcubemail.phpFpm.pool;
       wallabag = wallabag.phpFpm.pool;
       yourls = yourls.phpFpm.pool;
       rompr = rompr.phpFpm.pool;
@@ -192,20 +249,6 @@ in {
       ldap = ldap.phpFpm.pool;
       rainloop = rainloop.phpFpm.pool;
       kanboard = kanboard.phpFpm.pool;
-      devtools = ''
-        listen = /var/run/phpfpm/devtools.sock
-        user = wwwrun
-        group = wwwrun
-        listen.owner = wwwrun
-        listen.group = wwwrun
-        pm = dynamic
-        pm.max_children = 60
-        pm.start_servers = 2
-        pm.min_spare_servers = 1
-        pm.max_spare_servers = 10
-
-        php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"
-        '';
       tools = ''
         listen = /var/run/phpfpm/tools.sock
         user = wwwrun
@@ -250,21 +293,6 @@ in {
       ln -s ${kanboard.webRoot} $out/webapps/${kanboard.apache.webappName}
       '';
 
-    systemd.services.tt-rss = {
-      description = "Tiny Tiny RSS feeds update daemon";
-      serviceConfig = {
-        User = "wwwrun";
-        ExecStart = "${pkgs.php}/bin/php ${ttrss.webRoot}/update.php --daemon";
-        StandardOutput = "syslog";
-        StandardError = "syslog";
-        PermissionsStartOnly = true;
-      };
-
-      wantedBy = [ "multi-user.target" ];
-      requires = ["postgresql.service"];
-      after = ["network.target" "postgresql.service"];
-    };
-
   };
 }
 
diff --git a/nixops/modules/websites/tools/tools/roundcubemail.nix b/nixops/modules/websites/tools/tools/roundcubemail.nix
index 6177ff3..8974d1b 100644
--- a/nixops/modules/websites/tools/tools/roundcubemail.nix
+++ b/nixops/modules/websites/tools/tools/roundcubemail.nix
@@ -102,7 +102,6 @@ rec {
       '';
     socket = "/var/run/phpfpm/roundcubemail.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}