diff options
Diffstat (limited to 'nixops/modules/websites/tellesflorian/default.nix')
-rw-r--r-- | nixops/modules/websites/tellesflorian/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixops/modules/websites/tellesflorian/default.nix b/nixops/modules/websites/tellesflorian/default.nix index f86b0c5..381476c 100644 --- a/nixops/modules/websites/tellesflorian/default.nix +++ b/nixops/modules/websites/tellesflorian/default.nix | |||
@@ -1,13 +1,13 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, mylibs, ... }: |
2 | let | 2 | let |
3 | adminer = pkgs.callPackage ../commons/adminer.nix {}; | 3 | adminer = pkgs.callPackage ../commons/adminer.nix {}; |
4 | 4 | ||
5 | tellesflorian = pkgs.callPackage ./tellesflorian.nix { inherit (mylibs) fetchedGitPrivate; }; | 5 | tellesflorian_dev = pkgs.callPackage ./tellesflorian.nix { |
6 | tellesflorian_dev = tellesflorian { | 6 | inherit (pkgs.private.webapps) tellesflorian; |
7 | config = myconfig.env.websites.tellesflorian.integration; | 7 | config = myconfig.env.websites.tellesflorian.integration; |
8 | }; | 8 | }; |
9 | 9 | ||
10 | cfg = config.services.myWebsites.TellesFlorian; | 10 | cfg = config.services.myWebsites.TellesFlorian; |
11 | in { | 11 | in { |
12 | options.services.myWebsites.TellesFlorian = { | 12 | options.services.myWebsites.TellesFlorian = { |
13 | integration = { | 13 | integration = { |
@@ -24,7 +24,7 @@ in { | |||
24 | system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript; | 24 | system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript; |
25 | system.extraSystemBuilderCmds = '' | 25 | system.extraSystemBuilderCmds = '' |
26 | mkdir -p $out/webapps | 26 | mkdir -p $out/webapps |
27 | ln -s ${tellesflorian_dev.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName} | 27 | ln -s ${tellesflorian_dev.app.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName} |
28 | ''; | 28 | ''; |
29 | services.myWebsites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules; | 29 | services.myWebsites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules; |
30 | services.myWebsites.integration.vhostConfs.tellesflorian = { | 30 | services.myWebsites.integration.vhostConfs.tellesflorian = { |