VEGAS/websites: host landing page from packages

This commit is contained in:
Max Headroom 2022-08-06 00:46:07 +02:00
parent 2777cb0f5b
commit 90ac208ae7
3 changed files with 8 additions and 5 deletions

View file

@ -1,7 +1,10 @@
{ config, lib, tools, ... }:
{ config, inputs, lib, pkgs, tools, ... }:
let
importWebsites = expr: import expr { tools = tools.nginx; };
importWebsites = expr: import expr {
tools = tools.nginx;
packages = inputs.self.packages.${pkgs.system};
};
websites = tools.nginx.mappers.mapSubdomains (importWebsites ./websites.nix);

View file

@ -1,4 +1,4 @@
{ tools }:
{ tools, ... }:
with tools.vhosts;
let
inherit (tools) domain;

View file

@ -1,4 +1,4 @@
{ tools }:
{ packages, tools }:
with tools.vhosts;
let inherit (tools) domain; in
{
@ -6,7 +6,7 @@ let inherit (tools) domain; in
ktp = static "/srv/storage/www/soda/ktp";
legacy = static "/srv/storage/www/legacy";
soda = static "/srv/storage/www/soda"; # TODO: add back custom error pages, wttr.in cache
www = simplePHP "/srv/storage/www/${domain}" // { default = true; };
www = static packages.landing.webroot // { default = true; };
"shadertool.dev" = proxy "http://test-generic.int.${domain}";
"kokaido" = proxy "http://test-generic.int.${domain}:8080";