diff options
author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2017-06-02 08:33:49 -0400 |
---|---|---|
committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2017-06-02 08:34:21 -0400 |
commit | b7a364a86aa33a90c15efa7d68e77e1254783949 (patch) | |
tree | 2db1728e59c6cd8608d28de6c41f8ca2c8f08664 | |
parent | 0c51f21eeb843019295931f9c69debcf67383f57 (diff) |
Add new web root.
-rw-r--r-- | config/orbekk-pkgs.nix | 10 | ||||
-rw-r--r-- | config/web-server.nix | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/config/orbekk-pkgs.nix b/config/orbekk-pkgs.nix new file mode 100644 index 0000000..646a49f --- /dev/null +++ b/config/orbekk-pkgs.nix @@ -0,0 +1,10 @@ +# Requires something like this in nixPath: +# "orbekk=https://hydra.orbekk.com/project/orbekk-projects/channel/latest/nixexprs.tar.bz2" +{ config, lib, pkgs, ... }: +let + orbekkPkgs = import <orbekk> {}; +in +{ + nixpkgs.config.packageOverrides = pkgs: { + } // orbekkPkgs; +}
\ No newline at end of file diff --git a/config/web-server.nix b/config/web-server.nix index 72613a6..bb40c12 100644 --- a/config/web-server.nix +++ b/config/web-server.nix @@ -1,5 +1,7 @@ { config, lib, pkgs, ... }: { + imports = [ ./orbekk-pkgs.nix ]; + networking.firewall.allowedTCPPorts = [ 80 443 ]; services.nginx = { enable = true; @@ -23,6 +25,9 @@ "kj.orbekk.com" = { enableACME = true; forceSSL = true; + locations."/beta" = { + root = "${pkgs.www-orbekk}" + }; locations."/".proxyPass = "http://10.0.20.11:8011"; locations."/hledger" = { extraConfig = ''return 302 /hledger/;''; |