Move florian php configuration to dedicated module

2 files changed, 125 insertions, 175 deletions

diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 00fe644..5ce073a 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -1,40 +1,140 @@
 { lib, pkgs, config, myconfig,  ... }:
 let
   adminer = pkgs.callPackage ../commons/adminer.nix {};
-
-  tellesflorian  = pkgs.callPackage ./builder_app.nix {
-    inherit (pkgs.webapps) tellesflorian;
-    config = myconfig.env.websites.tellesflorian.integration;
-    apacheUser = config.services.httpd.Inte.user;
-    apacheGroup = config.services.httpd.Inte.group;
-  };
-
+  secrets = myconfig.env.websites.tellesflorian.integration;
+  app = pkgs.webapps.tellesflorian.override { environment = secrets.environment; };
   cfg = config.myServices.websites.florian.app;
+  pcfg = config.services.phpApplication;
 in {
   options.myServices.websites.florian.app.enable = lib.mkEnableOption "enable Florian's app in integration";
 
   config = lib.mkIf cfg.enable {
-    secrets.keys = tellesflorian.keys;
-    systemd.services.phpfpm-tellesflorian_dev.after = lib.mkAfter tellesflorian.phpFpm.serviceDeps;
-    systemd.services.phpfpm-tellesflorian_dev.wants = tellesflorian.phpFpm.serviceDeps;
-    systemd.services.phpfpm-tellesflorian_dev.preStart = lib.mkAfter tellesflorian.phpFpm.preStart;
-    services.phpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool;
-    system.activationScripts.tellesflorian_dev = tellesflorian.activationScript;
-    myServices.websites.webappDirs."${tellesflorian.apache.webappName}" = tellesflorian.app.webRoot;
-    services.websites.env.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules;
-    services.websites.env.integration.vhostConfs.tellesflorian = {
-      certName    = "eldiron";
+    services.phpApplication.apps.florian_dev = {
+      websiteEnv = "integration";
+      httpdUser = config.services.httpd.Inte.user;
+      httpdGroup = config.services.httpd.Inte.group;
+      inherit (app) webRoot varDir;
+      varDirPaths = {
+        "var" = "0700";
+      };
+      inherit app;
+      serviceDeps = [ "mysql.service" ];
+      preStartActions = [
+        "./bin/console --env=${app.environment} cache:clear --no-warmup"
+      ];
+      phpOpenbasedir = [ "/tmp" ];
+      phpPool = ''
+        php_admin_value[upload_max_filesize] = 20M
+        php_admin_value[post_max_size] = 20M
+        ;php_admin_flag[log_errors] = on
+        pm = ondemand
+        pm.max_children = 5
+        pm.process_idle_timeout = 60
+        env[SYMFONY_DEBUG_MODE] = "yes"
+      '';
+      phpWatchFiles = [
+        config.secrets.fullPaths."webapps/${app.environment}-tellesflorian"
+      ];
+    };
+
+    secrets.keys = [
+      {
+        dest = "webapps/${app.environment}-tellesflorian-passwords";
+        user = config.services.httpd.Inte.user;
+        group = config.services.httpd.Inte.user;
+        permissions = "0400";
+        text = ''
+          invite:${secrets.invite_passwords}
+        '';
+      }
+      {
+        dest = "webapps/${app.environment}-tellesflorian";
+        user = config.services.httpd.Inte.user;
+        group = config.services.httpd.Inte.user;
+        permissions = "0400";
+        text = ''
+          # This file is auto-generated during the composer install
+          parameters:
+            database_host: ${secrets.mysql.host}
+            database_port: ${secrets.mysql.port}
+            database_name: ${secrets.mysql.name}
+            database_user: ${secrets.mysql.user}
+            database_password: ${secrets.mysql.password}
+            mailer_transport: smtp
+            mailer_host: 127.0.0.1
+            mailer_user: null
+            mailer_password: null
+            secret: ${secrets.secret}
+        '';
+      }
+    ];
+
+    services.websites.env.integration.modules = adminer.apache.modules;
+    services.websites.env.integration.vhostConfs.florian_dev = {
+      certName     = "eldiron";
       addToCerts  = true;
-      hosts       = ["app.tellesflorian.com" ];
-      root        = tellesflorian.apache.root;
+      hosts       = [ "app.tellesflorian.com" ];
+      root        = pcfg.webappDirs.florian_dev;
       extraConfig = [
-        tellesflorian.apache.vhostConf
+        ''
+        <FilesMatch "\.php$">
+          SetHandler "proxy:unix:${pcfg.phpListenPaths.florian_dev}|fcgi://localhost"
+        </FilesMatch>
+
+        <Location />
+          AuthBasicProvider file ldap
+          Use LDAPConnect
+          Require ldap-group   cn=app.tellesflorian.com,cn=httpd,ou=services,dc=immae,dc=eu
+
+          AuthUserFile "${config.secrets.fullPaths."webapps/${app.environment}-tellesflorian-passwords"}"
+          Require user "invite"
+
+          ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://tellesflorian.com\"></html>"
+        </Location>
+
+        <Directory ${pcfg.webappDirs.florian_dev}>
+          Options Indexes FollowSymLinks MultiViews Includes
+          AllowOverride None
+          Require all granted
+
+          DirectoryIndex app_dev.php
+
+          <IfModule mod_negotiation.c>
+          Options -MultiViews
+          </IfModule>
+
+          <IfModule mod_rewrite.c>
+            RewriteEngine On
+
+            RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$
+            RewriteRule ^(.*) - [E=BASE:%1]
+
+            # Maintenance script
+            RewriteCond %{DOCUMENT_ROOT}/maintenance.php -f
+            RewriteCond %{SCRIPT_FILENAME} !maintenance.php
+            RewriteRule ^.*$ %{ENV:BASE}/maintenance.php [R=503,L]
+            ErrorDocument 503 /maintenance.php
+
+            # Sets the HTTP_AUTHORIZATION header removed by Apache
+            RewriteCond %{HTTP:Authorization} .
+            RewriteRule ^ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+
+            RewriteCond %{ENV:REDIRECT_STATUS} ^$
+            RewriteRule ^app_dev\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
+
+            # If the requested filename exists, simply serve it.
+            # We only want to let Apache serve files and not directories.
+            RewriteCond %{REQUEST_FILENAME} -f
+            RewriteRule ^ - [L]
+
+            # Rewrite all other queries to the front controller.
+            RewriteRule ^ %{ENV:BASE}/app_dev.php [L]
+          </IfModule>
+
+        </Directory>
+        ''
         adminer.apache.vhostConf
       ];
     };
-    services.filesWatcher.phpfpm-tellesflorian_dev = {
-      restart = true;
-      paths = [ "/var/secrets/webapps/${tellesflorian.app.environment}-tellesflorian" ];
-    };
   };
 }
diff --git a/modules/private/websites/florian/builder_app.nix b/modules/private/websites/florian/builder_app.nix
deleted file mode 100644
index c12663a..0000000
--- a/modules/private/websites/florian/builder_app.nix
+++ /dev/null
@@ -1,150 +0,0 @@
-{ apacheUser, apacheGroup, tellesflorian, mylibs, config }:
-rec {
-  app = tellesflorian.override { inherit (config) environment; };
-  keys = [
-    {
-      dest = "webapps/${app.environment}-tellesflorian-passwords";
-      user = apacheUser;
-      group = apacheGroup;
-      permissions = "0400";
-      text = ''
-        invite:${config.invite_passwords}
-      '';
-    }
-    {
-      dest = "webapps/${app.environment}-tellesflorian";
-      user = apacheUser;
-      group = apacheGroup;
-      permissions = "0400";
-      text = ''
-        # This file is auto-generated during the composer install
-        parameters:
-          database_host: ${config.mysql.host}
-          database_port: ${config.mysql.port}
-          database_name: ${config.mysql.name}
-          database_user: ${config.mysql.user}
-          database_password: ${config.mysql.password}
-          mailer_transport: smtp
-          mailer_host: 127.0.0.1
-          mailer_user: null
-          mailer_password: null
-          secret: ${config.secret}
-      '';
-    }
-  ];
-  phpFpm = rec {
-    preStart = mylibs.phpFpmPreStart {
-      inherit app;
-      inherit (app) varDir;
-      keyFiles = [
-        "/var/secrets/webapps/${app.environment}-tellesflorian"
-      ];
-      actions = [
-        "/run/wrappers/bin/sudo -u wwwrun ./bin/console --env=${app.environment} cache:clear --no-warmup"
-      ];
-    };
-    serviceDeps = [ "mysql.service" ];
-    socket = "/var/run/phpfpm/floriantelles-${app.environment}.sock";
-    pool = ''
-      listen = ${socket}
-      user = ${apacheUser}
-      group = ${apacheGroup}
-      listen.owner = ${apacheUser}
-      listen.group = ${apacheGroup}
-      php_admin_value[upload_max_filesize] = 20M
-      php_admin_value[post_max_size] = 20M
-      ;php_admin_flag[log_errors] = on
-      php_admin_value[open_basedir] = "/var/secrets/webapps/${app.environment}-tellesflorian:${app}:${app.varDir}:/tmp"
-      php_admin_value[session.save_path] = "${app.varDir}/phpSessions"
-      ${if app.environment == "dev" then ''
-      pm = ondemand
-      pm.max_children = 5
-      pm.process_idle_timeout = 60
-      env[SYMFONY_DEBUG_MODE] = "yes"
-      '' else ''
-      pm = dynamic
-      pm.max_children = 20
-      pm.start_servers = 2
-      pm.min_spare_servers = 1
-      pm.max_spare_servers = 3
-      ''}'';
-  };
-  apache = rec {
-    modules = [ "proxy_fcgi" ];
-    webappName = "florian_${app.environment}";
-    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
-    <FilesMatch "\.php$">
-      SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-    </FilesMatch>
-
-    ${if app.environment == "dev" then ''
-    <Location />
-      AuthBasicProvider file ldap
-      Use LDAPConnect
-      Require ldap-group   cn=app.tellesflorian.com,cn=httpd,ou=services,dc=immae,dc=eu
-
-      AuthUserFile "/var/secrets/webapps/${app.environment}-tellesflorian-passwords"
-      Require user "invite"
-
-      ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://tellesflorian.com\"></html>"
-    </Location>
-
-    <Directory ${root}>
-      Options Indexes FollowSymLinks MultiViews Includes
-      AllowOverride None
-      Require all granted
-
-      DirectoryIndex app_dev.php
-
-      <IfModule mod_negotiation.c>
-      Options -MultiViews
-      </IfModule>
-
-      <IfModule mod_rewrite.c>
-        RewriteEngine On
-
-        RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$
-        RewriteRule ^(.*) - [E=BASE:%1]
-
-        # Maintenance script
-        RewriteCond %{DOCUMENT_ROOT}/maintenance.php -f
-        RewriteCond %{SCRIPT_FILENAME} !maintenance.php
-        RewriteRule ^.*$ %{ENV:BASE}/maintenance.php [R=503,L]
-        ErrorDocument 503 /maintenance.php
-
-        # Sets the HTTP_AUTHORIZATION header removed by Apache
-        RewriteCond %{HTTP:Authorization} .
-        RewriteRule ^ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-
-        RewriteCond %{ENV:REDIRECT_STATUS} ^$
-        RewriteRule ^app_dev\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
-
-        # If the requested filename exists, simply serve it.
-        # We only want to let Apache serve files and not directories.
-        RewriteCond %{REQUEST_FILENAME} -f
-        RewriteRule ^ - [L]
-
-        # Rewrite all other queries to the front controller.
-        RewriteRule ^ %{ENV:BASE}/app_dev.php [L]
-      </IfModule>
-
-    </Directory>
-    '' else ''
-    <Directory ${root}>
-      Options Indexes FollowSymLinks MultiViews Includes
-      AllowOverride All
-      Require all granted
-    </Directory>
-    ''}
-    '';
-  };
-  activationScript = {
-    deps = [ "wrappers" ];
-    text = ''
-    install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir} \
-      ${app.varDir}/var
-    install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions
-    '';
-  };
-}