diff --git a/keys/ssh/marcel b/keys/ssh/marcel new file mode 100644 index 0000000..d3533d3 --- /dev/null +++ b/keys/ssh/marcel @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK255EY8KUx5cMXSuoERXJSzVnkDUM+y8sMAVrRoDBnn diff --git a/modules/TLMS/base.nix b/modules/TLMS/base.nix index c011faf..c28d9aa 100644 --- a/modules/TLMS/base.nix +++ b/modules/TLMS/base.nix @@ -77,7 +77,7 @@ in ../../keys/ssh/oxa1 ../../keys/ssh/marenz1 ../../keys/ssh/marenz2 - ../../keys/ssh/astro + ../../keys/ssh/marcel ]; }; services.openssh = { diff --git a/modules/data-hoarder/default.nix b/modules/data-hoarder/default.nix index 1f266d9..59ac5eb 100644 --- a/modules/data-hoarder/default.nix +++ b/modules/data-hoarder/default.nix @@ -16,5 +16,6 @@ ./website.nix ./trekkie.nix ./chemo.nix + ./landingpage.nix ]; } diff --git a/modules/data-hoarder/landingpage.nix b/modules/data-hoarder/landingpage.nix new file mode 100644 index 0000000..d9b36ac --- /dev/null +++ b/modules/data-hoarder/landingpage.nix @@ -0,0 +1,17 @@ +{ pkgs, config, ... }: { + services = { + nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts = { + "${(builtins.replaceStrings [ "tlm.solutions" ] [ "dvb.solutions" ] config.deployment-TLMS.domain)}" = { + enableACME = true; + forceSSL = true; + extraConfig = '' + rewrite ^ https://kid.${config.deployment-TLMS.domain}/en/map/ temporary; + ''; + }; + }; + }; + }; +}