aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/connexionswing/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixops/modules/websites/connexionswing/default.nix')
-rw-r--r--nixops/modules/websites/connexionswing/default.nix21
1 files changed, 11 insertions, 10 deletions
diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix
index 773c8de..2f82428 100644
--- a/nixops/modules/websites/connexionswing/default.nix
+++ b/nixops/modules/websites/connexionswing/default.nix
@@ -1,14 +1,15 @@
1{ lib, pkgs, config, mylibs, myconfig, ... }: 1{ lib, pkgs, config, mylibs, myconfig, ... }:
2let 2let
3 connexionswing = pkgs.callPackage ./connexionswing.nix { inherit (mylibs) fetchedGitPrivate; }; 3 connexionswing_dev = pkgs.callPackage ./connexionswing.nix {
4 connexionswing_dev = connexionswing { 4 inherit (pkgs.private.webapps) connexionswing;
5 config = myconfig.env.websites.connexionswing.integration; 5 config = myconfig.env.websites.connexionswing.integration;
6 }; 6 };
7 connexionswing_prod = connexionswing { 7 connexionswing_prod = pkgs.callPackage ./connexionswing.nix {
8 config = myconfig.env.websites.connexionswing.production; 8 inherit (pkgs.private.webapps) connexionswing;
9 }; 9 config = myconfig.env.websites.connexionswing.production;
10 };
10 11
11 cfg = config.services.myWebsites.Connexionswing; 12 cfg = config.services.myWebsites.Connexionswing;
12in { 13in {
13 options.services.myWebsites.Connexionswing = { 14 options.services.myWebsites.Connexionswing = {
14 production = { 15 production = {
@@ -40,7 +41,7 @@ in {
40 system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript; 41 system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript;
41 system.extraSystemBuilderCmds = '' 42 system.extraSystemBuilderCmds = ''
42 mkdir -p $out/webapps 43 mkdir -p $out/webapps
43 ln -s ${connexionswing_prod.webRoot} $out/webapps/${connexionswing_prod.apache.webappName} 44 ln -s ${connexionswing_prod.app.webRoot} $out/webapps/${connexionswing_prod.apache.webappName}
44 ''; 45 '';
45 services.myWebsites.production.modules = connexionswing_prod.apache.modules; 46 services.myWebsites.production.modules = connexionswing_prod.apache.modules;
46 services.myWebsites.production.vhostConfs.connexionswing = { 47 services.myWebsites.production.vhostConfs.connexionswing = {
@@ -61,7 +62,7 @@ in {
61 system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript; 62 system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript;
62 system.extraSystemBuilderCmds = '' 63 system.extraSystemBuilderCmds = ''
63 mkdir -p $out/webapps 64 mkdir -p $out/webapps
64 ln -s ${connexionswing_dev.webRoot} $out/webapps/${connexionswing_dev.apache.webappName} 65 ln -s ${connexionswing_dev.app.webRoot} $out/webapps/${connexionswing_dev.apache.webappName}
65 ''; 66 '';
66 services.myWebsites.integration.modules = connexionswing_dev.apache.modules; 67 services.myWebsites.integration.modules = connexionswing_dev.apache.modules;
67 services.myWebsites.integration.vhostConfs.connexionswing = { 68 services.myWebsites.integration.vhostConfs.connexionswing = {