diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-11 12:16:57 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-11 12:16:57 +0200 |
commit | 1bd8b03eeaafa9345282d8aaf6499bc80adf062f (patch) | |
tree | a80e655fbf0dad25c29c41a7f880a4c3574edebf /nixops/modules/websites/aten/default.nix | |
parent | 9eae2b47b7b315b05a0e010f3003bd875685e260 (diff) | |
download | Nix-1bd8b03eeaafa9345282d8aaf6499bc80adf062f.tar.gz Nix-1bd8b03eeaafa9345282d8aaf6499bc80adf062f.tar.zst Nix-1bd8b03eeaafa9345282d8aaf6499bc80adf062f.zip |
Move Aten packages to pkgs
Diffstat (limited to 'nixops/modules/websites/aten/default.nix')
-rw-r--r-- | nixops/modules/websites/aten/default.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix index fd3f7cc..efd3619 100644 --- a/nixops/modules/websites/aten/default.nix +++ b/nixops/modules/websites/aten/default.nix | |||
@@ -1,14 +1,15 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, mylibs, ... }: |
2 | let | 2 | let |
3 | aten = pkgs.callPackage ./aten.nix { inherit (mylibs) fetchedGitPrivate yarn2nixPackage; }; | 3 | aten_dev = pkgs.callPackage ./aten.nix { |
4 | aten_dev = aten { | 4 | inherit (pkgs.private.webapps) aten; |
5 | config = myconfig.env.websites.aten.integration; | 5 | config = myconfig.env.websites.aten.integration; |
6 | }; | 6 | }; |
7 | aten_prod = aten { | 7 | aten_prod = pkgs.callPackage ./aten.nix { |
8 | config = myconfig.env.websites.aten.production; | 8 | inherit (pkgs.private.webapps) aten; |
9 | }; | 9 | config = myconfig.env.websites.aten.production; |
10 | }; | ||
10 | 11 | ||
11 | cfg = config.services.myWebsites.Aten; | 12 | cfg = config.services.myWebsites.Aten; |
12 | in { | 13 | in { |
13 | options.services.myWebsites.Aten = { | 14 | options.services.myWebsites.Aten = { |
14 | production = { | 15 | production = { |
@@ -37,7 +38,7 @@ in { | |||
37 | system.activationScripts.aten_prod = aten_prod.activationScript; | 38 | system.activationScripts.aten_prod = aten_prod.activationScript; |
38 | system.extraSystemBuilderCmds = '' | 39 | system.extraSystemBuilderCmds = '' |
39 | mkdir -p $out/webapps | 40 | mkdir -p $out/webapps |
40 | ln -s ${aten_prod.webRoot} $out/webapps/${aten_prod.apache.webappName} | 41 | ln -s ${aten_prod.app.webRoot} $out/webapps/${aten_prod.apache.webappName} |
41 | ''; | 42 | ''; |
42 | services.myWebsites.apacheConfig.aten_prod.modules = aten_prod.apache.modules; | 43 | services.myWebsites.apacheConfig.aten_prod.modules = aten_prod.apache.modules; |
43 | services.myWebsites.production.modules = aten_prod.apache.modules; | 44 | services.myWebsites.production.modules = aten_prod.apache.modules; |
@@ -57,7 +58,7 @@ in { | |||
57 | system.activationScripts.aten_dev = aten_dev.activationScript; | 58 | system.activationScripts.aten_dev = aten_dev.activationScript; |
58 | system.extraSystemBuilderCmds = '' | 59 | system.extraSystemBuilderCmds = '' |
59 | mkdir -p $out/webapps | 60 | mkdir -p $out/webapps |
60 | ln -s ${aten_dev.webRoot} $out/webapps/${aten_dev.apache.webappName} | 61 | ln -s ${aten_dev.app.webRoot} $out/webapps/${aten_dev.apache.webappName} |
61 | ''; | 62 | ''; |
62 | services.myWebsites.integration.modules = aten_dev.apache.modules; | 63 | services.myWebsites.integration.modules = aten_dev.apache.modules; |
63 | services.myWebsites.integration.vhostConfs.aten = { | 64 | services.myWebsites.integration.vhostConfs.aten = { |