X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fconnexionswing%2Fintegration.nix;fp=modules%2Fprivate%2Fwebsites%2Fconnexionswing%2Fintegration.nix;h=fe0e4d93c6a9e1396d369669caed4a0bdee7cac7;hb=41cce84a02652e22ad967c9f31669092eb3e7f0e;hp=93cda002b5b5099095a5f5ebc998f78097fff3e5;hpb=750fe5a43b957b91a26069cf8a4fe19fc7b2633c;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix
index 93cda00..fe0e4d9 100644
--- 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 = [
''
SetHandler "proxy:unix:${pcfg.phpListenPaths.connexionswing_integration}|fcgi://localhost"
-
+
Options FollowSymLinks
AllowOverride None
Require all granted
-
+
Options FollowSymLinks
AllowOverride None
Require all granted
@@ -99,7 +95,7 @@ in {
ErrorDocument 401 ""
-
+
Options Indexes FollowSymLinks MultiViews Includes
AllowOverride None
Require all granted