X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fconnexionswing%2Fintegration.nix;h=fe0e4d93c6a9e1396d369669caed4a0bdee7cac7;hb=41cce84a02652e22ad967c9f31669092eb3e7f0e;hp=b4de4e19040c31b4784b109cce2ecb39a516a5e5;hpb=d3452fc59b9839846225fd254926c64a9c71f071;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix
index b4de4e1..fe0e4d9 100644
--- a/modules/private/websites/connexionswing/integration.nix
+++ b/modules/private/websites/connexionswing/integration.nix
@@ -1,11 +1,8 @@
{ lib, pkgs, config, ... }:
let
secrets = config.myEnv.websites.connexionswing.integration;
- app = pkgs.callPackage ./app {
- 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 {
@@ -17,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 = {
@@ -43,52 +40,50 @@ in {
phpWatchFiles = [
config.secrets.fullPaths."websites/connexionswing/integration"
];
+ phpPackage = pkgs.php72;
};
- secrets.keys = [
- {
- dest = "websites/connexionswing/integration";
- user = config.services.httpd.Inte.user;
- group = config.services.httpd.Inte.group;
- 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.database}
- database_user: ${secrets.mysql.user}
- database_password: ${secrets.mysql.password}
- database_server_version: ${pkgs.mariadb.mysqlVersion}
- mailer_transport: sendmail
- mailer_host: null
- mailer_user: null
- mailer_password: null
- subscription_email: ${secrets.email}
- allow_robots: true
- secret: ${secrets.secret}
- '';
- }
- ];
+ secrets.keys."websites/connexionswing/integration" = {
+ user = config.services.httpd.Inte.user;
+ group = config.services.httpd.Inte.group;
+ 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.database}
+ database_user: ${secrets.mysql.user}
+ database_password: ${secrets.mysql.password}
+ database_server_version: ${pkgs.mariadb.mysqlVersion}
+ mailer_transport: sendmail
+ mailer_host: null
+ mailer_user: null
+ mailer_password: null
+ subscription_email: ${secrets.email}
+ allow_robots: true
+ secret: ${secrets.secret}
+ '';
+ };
services.websites.env.integration.vhostConfs.connexionswing_integration = {
certName = "integration";
addToCerts = true;
hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ];
- root = pcfg.webappDirs.connexionswing_integration;
+ 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
@@ -100,7 +95,7 @@ in {
ErrorDocument 401 ""
-
+
Options Indexes FollowSymLinks MultiViews Includes
AllowOverride None
Require all granted