From 90ac208ae71cc305191501d97988cfb7c531f815 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 6 Aug 2022 00:46:07 +0200 Subject: [PATCH] VEGAS/websites: host landing page from packages --- hosts/VEGAS/services/websites/default.nix | 7 +++++-- hosts/VEGAS/services/websites/extra-sites.nix | 2 +- hosts/VEGAS/services/websites/websites.nix | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hosts/VEGAS/services/websites/default.nix b/hosts/VEGAS/services/websites/default.nix index 7b71772..ee9358e 100644 --- a/hosts/VEGAS/services/websites/default.nix +++ b/hosts/VEGAS/services/websites/default.nix @@ -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); diff --git a/hosts/VEGAS/services/websites/extra-sites.nix b/hosts/VEGAS/services/websites/extra-sites.nix index 237f55f..62a12c1 100644 --- a/hosts/VEGAS/services/websites/extra-sites.nix +++ b/hosts/VEGAS/services/websites/extra-sites.nix @@ -1,4 +1,4 @@ -{ tools }: +{ tools, ... }: with tools.vhosts; let inherit (tools) domain; diff --git a/hosts/VEGAS/services/websites/websites.nix b/hosts/VEGAS/services/websites/websites.nix index b775cc8..0cd5e74 100644 --- a/hosts/VEGAS/services/websites/websites.nix +++ b/hosts/VEGAS/services/websites/websites.nix @@ -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";