Move devtools to other place

[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 93cda002b5b5099095a5f5ebc998f78097fff3e5..fe0e4d93c6a9e1396d369669caed4a0bdee7cac7 100644 (file)
--- a/modules/private/websites/connexionswing/integration.nix
+++ b/modules/private/websites/connexionswing/integration.nix
@@ -1,12 +1,8 @@
  { lib, pkgs, config,  ... }:
  let
    secrets = config.myEnv.websites.connexionswing.integration;
-  app = pkgs.callPackage ./app {
-    composerEnv = pkgs.composerEnv.override { php = pkgs.php72; };
-    environment = secrets.environment;
-    varDir = "/var/lib/connexionswing_integration";
-    secretsPath = config.secrets.fullPaths."websites/connexionswing/integration";
-  };
+  webRoot = "/var/lib/ftp/immae/connexionswing/web";
+  varDir = "/var/lib/ftp/immae/connexionswing_var";
    cfg = config.myServices.websites.connexionswing.integration;
    pcfg = config.services.phpApplication;
  in {
@@ -18,16 +14,16 @@ in {
        websiteEnv = "integration";
        httpdUser = config.services.httpd.Inte.user;
        httpdGroup = config.services.httpd.Inte.group;
-      inherit (app) webRoot varDir;
+      inherit webRoot varDir;
        varDirPaths = {
          "medias" = "0700";
          "uploads" = "0700";
          "var" = "0700";
        };
-      inherit app;
+      app = "/var/lib/ftp/immae/connexionswing";
        serviceDeps = [ "mysql.service" ];
        preStartActions = [
-        "./bin/console --env=${app.environment} cache:clear --no-warmup"
+        "./bin/console --env=dev cache:clear --no-warmup"
        ];
        phpOpenbasedir = [ "/tmp" "/run/wrappers/bin/sendmail" ];
        phpPool = {
@@ -74,20 +70,20 @@ in {
        certName    = "integration";
        addToCerts  = true;
        hosts       = ["connexionswing.immae.eu" "sandetludo.immae.eu" ];
-      root        = app.webRoot;
+      root        = webRoot;
        extraConfig = [
          ''
          <FilesMatch "\.php$">
            SetHandler "proxy:unix:${pcfg.phpListenPaths.connexionswing_integration}|fcgi://localhost"
          </FilesMatch>
  
-        <Directory ${app.varDir}/medias>
+        <Directory ${varDir}/medias>
            Options FollowSymLinks
            AllowOverride None
            Require all granted
          </Directory>
  
-        <Directory ${app.varDir}/uploads>
+        <Directory ${varDir}/uploads>
            Options FollowSymLinks
            AllowOverride None
            Require all granted
@@ -99,7 +95,7 @@ in {
            ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://connexionswing.com\"></html>"
          </Location>
  
-        <Directory ${app.webRoot}>
+        <Directory ${webRoot}>
            Options Indexes FollowSymLinks MultiViews Includes
            AllowOverride None
            Require all granted