X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fconnexionswing%2Fintegration.nix;h=c1165b8b846e82cd237d189e388364661643210d;hb=5315b439af1f72c3282549508ae58d86d66e38ec;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..c1165b8 100644 --- a/modules/private/websites/connexionswing/integration.nix +++ b/modules/private/websites/connexionswing/integration.nix @@ -1,33 +1,28 @@ { 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 { options.myServices.websites.connexionswing.integration.enable = lib.mkEnableOption "enable Connexionswing's website in integration"; config = lib.mkIf cfg.enable { - 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; - 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 +69,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 +94,7 @@ in { ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted