diff options
Diffstat (limited to 'modules/private/websites/connexionswing')
-rw-r--r-- | modules/private/websites/connexionswing/integration.nix | 5 | ||||
-rw-r--r-- | modules/private/websites/connexionswing/production.nix | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix index 6570977..1d8488a 100644 --- a/modules/private/websites/connexionswing/integration.nix +++ b/modules/private/websites/connexionswing/integration.nix | |||
@@ -22,10 +22,7 @@ in { | |||
22 | phpOptions = config.services.phpfpm.phpOptions + connexionswing.phpFpm.phpConfig; | 22 | phpOptions = config.services.phpfpm.phpOptions + connexionswing.phpFpm.phpConfig; |
23 | }; | 23 | }; |
24 | system.activationScripts.connexionswing_dev = connexionswing.activationScript; | 24 | system.activationScripts.connexionswing_dev = connexionswing.activationScript; |
25 | system.extraSystemBuilderCmds = '' | 25 | myServices.websites.webappDirs."${connexionswing.apache.webappName}" = connexionswing.app.webRoot; |
26 | mkdir -p $out/webapps | ||
27 | ln -s ${connexionswing.app.webRoot} $out/webapps/${connexionswing.apache.webappName} | ||
28 | ''; | ||
29 | services.websites.integration.modules = connexionswing.apache.modules; | 26 | services.websites.integration.modules = connexionswing.apache.modules; |
30 | services.websites.integration.vhostConfs.connexionswing = { | 27 | services.websites.integration.vhostConfs.connexionswing = { |
31 | certName = "eldiron"; | 28 | certName = "eldiron"; |
diff --git a/modules/private/websites/connexionswing/production.nix b/modules/private/websites/connexionswing/production.nix index b51c549..555f129 100644 --- a/modules/private/websites/connexionswing/production.nix +++ b/modules/private/websites/connexionswing/production.nix | |||
@@ -24,10 +24,7 @@ in { | |||
24 | phpOptions = config.services.phpfpm.phpOptions + connexionswing.phpFpm.phpConfig; | 24 | phpOptions = config.services.phpfpm.phpOptions + connexionswing.phpFpm.phpConfig; |
25 | }; | 25 | }; |
26 | system.activationScripts.connexionswing_prod = connexionswing.activationScript; | 26 | system.activationScripts.connexionswing_prod = connexionswing.activationScript; |
27 | system.extraSystemBuilderCmds = '' | 27 | myServices.websites.webappDirs."${connexionswing.apache.webappName}" = connexionswing.app.webRoot; |
28 | mkdir -p $out/webapps | ||
29 | ln -s ${connexionswing.app.webRoot} $out/webapps/${connexionswing.apache.webappName} | ||
30 | ''; | ||
31 | services.websites.production.modules = connexionswing.apache.modules; | 28 | services.websites.production.modules = connexionswing.apache.modules; |
32 | services.websites.production.vhostConfs.connexionswing = { | 29 | services.websites.production.vhostConfs.connexionswing = { |
33 | certName = "connexionswing"; | 30 | certName = "connexionswing"; |