c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

c3d2-web: deploy in full glory

This commit is contained in:
Astro 2021-10-06 16:43:36 +02:00
parent 8d63790f86
commit 8b15c0c066
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hosts/containers/c3d2-web/default.nix
View File

@ -19,6 +19,7 @@ in
services.nginx = { services.nginx = {
enable = true; enable = true;
virtualHosts = { virtualHosts = {
# c3d2
"www.c3d2.de" = { "www.c3d2.de" = {
default = true; default = true;
serverAliases = [ serverAliases = [
@ -27,31 +28,29 @@ in
"cccdd.de" "www.cccdd.de" "cccdd.de" "www.cccdd.de"
"dresden.ccc.de" "www.dresden.ccc.de" "dresden.ccc.de" "www.dresden.ccc.de"
]; ];
# TODO: enableACME = true;
# enableACME = true; forceSSL = true;
# forceSSL = true;
root = "${webroot}/c3d2"; root = "${webroot}/c3d2";
extraConfig = '' extraConfig = ''
index portal.html; index portal.html index.html;
''; '';
locations = { locations = {
# SpaceAPI # SpaceAPI
"/status.png".proxyPass = "http://[${hostRegistry.hosts.spaceapi.ip6}]:3000/status.png"; "/status.png".proxyPass = "http://[${hostRegistry.hosts.spaceapi.ip6}]:3000/status.png";
"/spaceapi.json".proxyPass = "http://[${hostRegistry.hosts.spaceapi.ip6}]:3000/spaceapi.json"; "/spaceapi.json".proxyPass = "http://[${hostRegistry.hosts.spaceapi.ip6}]:3000/spaceapi.json";
# Jabber # Jabber
# TODO: does this work?
"/http-bind".proxyPass = "http://jabber.c3d2.de:5280/http-bind"; "/http-bind".proxyPass = "http://jabber.c3d2.de:5280/http-bind";
# TODO: websockets too?
}; };
}; };
# datenspuren
"datenspuren.de" = { "datenspuren.de" = {
serverAliases = [ serverAliases = [
"www.datenspuren.de" "www.datenspuren.de"
"ds.c3d2.de" "datenspuren.c3d2.de"
]; ];
# TODO: enableACME = true;
# enableACME = true; forceSSL = true;
# forceSSL = true;
root = "${webroot}/c3d2/datenspuren"; root = "${webroot}/c3d2/datenspuren";
extraConfig = '' extraConfig = ''
index index.html; index index.html;
@ -59,6 +58,18 @@ in
''; '';
}; };
# autotopia
"autotopia.c3d2.de" = {
enableACME = true;
forceSSL = true;
root = "${webroot}/c3d2/autotopia";
extraConfig = ''
index index.html;
rewrite ^/$ /2020/ redirect;
'';
};
# hooks, logs
"c3d2-web.serv.zentralwerk.org" = { "c3d2-web.serv.zentralwerk.org" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
@ -174,5 +185,4 @@ in
ProtectSystem = "full"; ProtectSystem = "full";
}; };
}; };
# TODO: letsencrypt /.well-known before DNS switch
} }

12
hosts/containers/public-access-proxy/default.nix
View File

@ -47,6 +47,18 @@
hostNames = [ "sdr.hq.c3d2.de" ]; hostNames = [ "sdr.hq.c3d2.de" ];
proxyTo.host = hostRegistry.hosts.radiobert.ip4; proxyTo.host = hostRegistry.hosts.radiobert.ip4;
} }
{
hostNames = [
"www.c3d2.de" "c3d2.de"
"c3dd.de" "www.c3dd.de"
"cccdd.de" "www.cccdd.de"
"dresden.ccc.de" "www.dresden.ccc.de"
"datenspuren.de" "www.datenspuren.de"
"datenspuren.c3d2.de" "ds.c3d2.de"
"autotopia.c3d2.de"
];
proxyTo.host = hostRegistry.hosts.c3d2-web.ip4;
}
]; ];
}; };