diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-22 20:01:33 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-22 20:01:33 +0200 |
commit | 4288c2f2431fb782b0d512b1b3749187f2374b6a (patch) | |
tree | aaf812414f91d6b695a7507265e7572de8dc477c /modules/private/websites/chloe | |
parent | f40f5b235b890f46770a22f005f8a0f664cf0562 (diff) | |
download | Nix-4288c2f2431fb782b0d512b1b3749187f2374b6a.tar.gz Nix-4288c2f2431fb782b0d512b1b3749187f2374b6a.tar.zst Nix-4288c2f2431fb782b0d512b1b3749187f2374b6a.zip |
Move websites/tools to modules
Diffstat (limited to 'modules/private/websites/chloe')
-rw-r--r-- | modules/private/websites/chloe/integration.nix | 5 | ||||
-rw-r--r-- | modules/private/websites/chloe/production.nix | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix index d49a85c..c42a428 100644 --- a/modules/private/websites/chloe/integration.nix +++ b/modules/private/websites/chloe/integration.nix | |||
@@ -23,10 +23,7 @@ in { | |||
23 | ''; | 23 | ''; |
24 | }; | 24 | }; |
25 | system.activationScripts.chloe_dev = chloe.activationScript; | 25 | system.activationScripts.chloe_dev = chloe.activationScript; |
26 | system.extraSystemBuilderCmds = '' | 26 | myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot; |
27 | mkdir -p $out/webapps | ||
28 | ln -s ${chloe.app.webRoot} $out/webapps/${chloe.apache.webappName} | ||
29 | ''; | ||
30 | services.websites.integration.modules = chloe.apache.modules; | 27 | services.websites.integration.modules = chloe.apache.modules; |
31 | services.websites.integration.vhostConfs.chloe = { | 28 | services.websites.integration.vhostConfs.chloe = { |
32 | certName = "eldiron"; | 29 | certName = "eldiron"; |
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix index d4b2299..0bf2d8f 100644 --- a/modules/private/websites/chloe/production.nix +++ b/modules/private/websites/chloe/production.nix | |||
@@ -25,10 +25,7 @@ in { | |||
25 | ''; | 25 | ''; |
26 | }; | 26 | }; |
27 | system.activationScripts.chloe_prod = chloe.activationScript; | 27 | system.activationScripts.chloe_prod = chloe.activationScript; |
28 | system.extraSystemBuilderCmds = '' | 28 | myServices.websites.webappDirs."${chloe.apache.webappName}" = chloe.app.webRoot; |
29 | mkdir -p $out/webapps | ||
30 | ln -s ${chloe.app.webRoot} $out/webapps/${chloe.apache.webappName} | ||
31 | ''; | ||
32 | services.websites.production.modules = chloe.apache.modules; | 29 | services.websites.production.modules = chloe.apache.modules; |
33 | services.websites.production.vhostConfs.chloe = { | 30 | services.websites.production.vhostConfs.chloe = { |
34 | certName = "chloe"; | 31 | certName = "chloe"; |