X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fconnexionswing%2Fintegration.nix;h=b4de4e19040c31b4784b109cce2ecb39a516a5e5;hb=3c50eea8d946bf8417f49fa8a4a6e109e0439c7b;hp=c0f7445ba68a2128d2cf6c9bacc918e8ad718a32;hpb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix
index c0f7445..b4de4e1 100644
--- 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;
@@ -25,23 +29,25 @@ in {
"./bin/console --env=${app.environment} cache:clear --no-warmup"
];
phpOpenbasedir = [ "/tmp" "/run/wrappers/bin/sendmail" ];
- phpPool = ''
- php_admin_value[upload_max_filesize] = 20M
- php_admin_value[post_max_size] = 20M
- ;php_admin_flag[log_errors] = on
- pm = ondemand
- pm.max_children = 5
- pm.process_idle_timeout = 60
- env[SYMFONY_DEBUG_MODE] = "yes"
- '';
+ phpPool = {
+ "php_admin_value[upload_max_filesize]" = "20M";
+ "php_admin_value[post_max_size]" = "20M";
+ #"php_admin_flag[log_errors]" = "on";
+ "pm" = "ondemand";
+ "pm.max_children" = "5";
+ "pm.process_idle_timeout" = "60";
+ };
+ phpEnv = {
+ 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";
@@ -65,15 +71,15 @@ in {
}
];
- services.websites.env.integration.vhostConfs.connexionswing_dev = {
- certName = "eldiron";
+ 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 = [
''
- SetHandler "proxy:unix:${pcfg.phpListenPaths.connexionswing_dev}|fcgi://localhost"
+ SetHandler "proxy:unix:${pcfg.phpListenPaths.connexionswing_integration}|fcgi://localhost"
@@ -94,7 +100,7 @@ in {
ErrorDocument 401 ""
-
+
Options Indexes FollowSymLinks MultiViews Includes
AllowOverride None
Require all granted