Refactor websites

[perso/Immae/Config/Nix.git] / modules / private / websites / connexionswing / integration.nix
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix

index 4f7b72d75dbdb2f19ab10b70a14cc635a4c4efe7..b4de4e19040c31b4784b109cce2ecb39a516a5e5 100644 (file)
--- a/modules/private/websites/connexionswing/integration.nix
+++ b/modules/private/websites/connexionswing/integration.nix
@@ -1,15 +1,19 @@
  { lib, pkgs, config,  ... }:
  let
    secrets = config.myEnv.websites.connexionswing.integration;
-  app = pkgs.webapps.connexionswing.override { environment = secrets.environment; };
+  app = pkgs.callPackage ./app {
+    environment = secrets.environment;
+    varDir = "/var/lib/connexionswing_integration";
+    secretsPath = config.secrets.fullPaths."websites/connexionswing/integration";
+  };
    cfg = config.myServices.websites.connexionswing.integration;
    pcfg = config.services.phpApplication;
  in {
    options.myServices.websites.connexionswing.integration.enable = lib.mkEnableOption "enable Connexionswing's website in integration";
  
    config = lib.mkIf cfg.enable {
-    services.duplyBackup.profiles.connexionswing_dev.rootDir = app.varDir;
-    services.phpApplication.apps.connexionswing_dev = {
+    services.duplyBackup.profiles.connexionswing_integration.rootDir = app.varDir;
+    services.phpApplication.apps.connexionswing_integration = {
        websiteEnv = "integration";
        httpdUser = config.services.httpd.Inte.user;
        httpdGroup = config.services.httpd.Inte.group;
@@ -34,16 +38,16 @@ in {
          "pm.process_idle_timeout" = "60";
          };
        phpEnv = {
-        SYMFONY_DEBUG_MODE = "yes";
+        SYMFONY_DEBUG_MODE = "\"yes\"";
        };
        phpWatchFiles = [
-        config.secrets.fullPaths."webapps/${app.environment}-connexionswing"
+        config.secrets.fullPaths."websites/connexionswing/integration"
        ];
      };
  
      secrets.keys = [
        {
-        dest = "webapps/${app.environment}-connexionswing";
+        dest = "websites/connexionswing/integration";
          user = config.services.httpd.Inte.user;
          group = config.services.httpd.Inte.group;
          permissions = "0400";
@@ -67,15 +71,15 @@ in {
        }
      ];
  
-    services.websites.env.integration.vhostConfs.connexionswing_dev = {
-      certName     = "integration";
+    services.websites.env.integration.vhostConfs.connexionswing_integration = {
+      certName    = "integration";
        addToCerts  = true;
        hosts       = ["connexionswing.immae.eu" "sandetludo.immae.eu" ];
-      root        = pcfg.webappDirs.connexionswing_dev;
+      root        = pcfg.webappDirs.connexionswing_integration;
        extraConfig = [
          ''
          <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${pcfg.phpListenPaths.connexionswing_dev}|fcgi://localhost"
+          SetHandler "proxy:unix:${pcfg.phpListenPaths.connexionswing_integration}|fcgi://localhost"
          </FilesMatch>
  
          <Directory ${app.varDir}/medias>
@@ -96,7 +100,7 @@ in {
            ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://connexionswing.com\"></html>"
          </Location>
  
-        <Directory ${pcfg.webappDirs.connexionswing_dev}>
+        <Directory ${pcfg.webappDirs.connexionswing_integration}>
            Options Indexes FollowSymLinks MultiViews Includes
            AllowOverride None
            Require all granted