From e5073addbe397afd596613af469f3308a07c1801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 16 Feb 2019 14:09:27 +0100 Subject: Move integration websites to use stable web directory This permits to avoir having to restart httpd at each application deployment --- nixops/modules/websites/connexionswing/connexionswing.nix | 6 ++++-- nixops/modules/websites/connexionswing/default.nix | 10 +++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'nixops/modules/websites/connexionswing') diff --git a/nixops/modules/websites/connexionswing/connexionswing.nix b/nixops/modules/websites/connexionswing/connexionswing.nix index 307def0..dff563f 100644 --- a/nixops/modules/websites/connexionswing/connexionswing.nix +++ b/nixops/modules/websites/connexionswing/connexionswing.nix @@ -56,10 +56,12 @@ let pm.max_spare_servers = 3 ''}''; }; - apache = { + apache = rec { user = "wwwrun"; group = "wwwrun"; modules = [ "proxy_fcgi" ]; + webappName = "connexionswing_${environment}"; + root = "/run/current-system/webapps/${webappName}"; vhostConf = '' SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" @@ -84,7 +86,7 @@ let ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix index 5ce3525..f176762 100644 --- a/nixops/modules/websites/connexionswing/default.nix +++ b/nixops/modules/websites/connexionswing/default.nix @@ -45,6 +45,10 @@ in { services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool; services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig; system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript; + system.extraSystemBuilderCmds = '' + mkdir -p $out/webapps + ln -s ${connexionswing_prod.webRoot} $out/webapps/${connexionswing_prod.apache.webappName} + ''; services.myWebsites.production.modules = connexionswing_prod.apache.modules; services.myWebsites.production.vhostConfs.connexionswing = { certName = "connexionswing"; @@ -59,11 +63,15 @@ in { services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool; services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig; system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript; + system.extraSystemBuilderCmds = '' + mkdir -p $out/webapps + ln -s ${connexionswing_dev.webRoot} $out/webapps/${connexionswing_dev.apache.webappName} + ''; services.myWebsites.integration.modules = connexionswing_dev.apache.modules; services.myWebsites.integration.vhostConfs.connexionswing = { certName = "eldiron"; hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ]; - root = connexionswing_dev.webRoot; + root = connexionswing_dev.apache.root; extraConfig = [ connexionswing_dev.apache.vhostConf ]; }; }) -- cgit v1.2.3