maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ops/modules/www): Make self-redirect to config a generic module

Browse source 
As suggested by sterni, this makes the self-redirect of a machine to
its configuration a generic module working by convention.

In the process of moving this two small fixes have been applied:

* redirect is only applied if the URI is `/`, this is required for
  ACME to work
* addSSL = true is added, otherwise we have a certificate but no TLS
  listener

Change-Id: Icaef041ff681253a61e36926417bdb2844e3f93d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5313
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2022-02-18 14:32:25 +03:00 • committed by tazjin
parent 5b701ad713
commit ac6717fe3c
5 changed files with 29 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ops/modules/www/sanduny.tvl.su.nix
View file

@ -1,16 +0,0 @@
# Redirect sanduny.tvl.su to the machine configuration.
{
imports = [
./base.nix
];
config.services.nginx.virtualHosts."sanduny.tvl.su" = {
serverName = "sanduny.tvl.su";
enableACME = true;
extraConfig = ''
return 302 https://at.tvl.fyi/?q=%2F%2Fops%2Fmachines%2Fsanduny;
'';
};
}

27
ops/modules/www/self-redirect.nix Normal file
View file

@ -0,0 +1,27 @@
# Redirect the hostname of a machine to its configuration in a web
# browser.
#
# Works by convention, assuming that the machine has its configuration
# at //ops/machines/${hostname}.
{ config, ... }:
let
host = "${config.networking.hostName}.${config.networking.domain}";
in
{
imports = [
./base.nix
];
config.services.nginx.virtualHosts."${host}" = {
serverName = host;
addSSL = true; # SSL is not forced on these redirects
enableACME = true;
extraConfig = ''
location = / {
return 302 https://at.tvl.fyi/?q=%2F%2Fops%2Fmachines%2F${config.networking.hostName};
}
'';
};
}

17
ops/modules/www/whitby.tvl.fyi.nix
View file

@ -1,17 +0,0 @@
# Redirect whitby.tvl.fyi to the machine configuration.
{
imports = [
./base.nix
];
config.services.nginx.virtualHosts."whitby.tvl.fyi" = {
serverName = "whitby.tvl.fyi";
serverAliases = [ "whitby.tvl.su" ];
enableACME = true;
extraConfig = ''
return 302 https://at.tvl.fyi/?q=%2F%2Fops%2Fmachines%2Fwhitby;
'';
};
}