From 56ad50f3f456899f827f71a8b1bfc9f07468cc8f Mon Sep 17 00:00:00 2001 From: hexchen Date: Thu, 7 Jan 2021 00:29:41 +0000 Subject: [PATCH] hainich/murmur: add mumble.infra4future.de website --- .../hosts/hainich/services/murmur.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/configuration/hosts/hainich/services/murmur.nix b/configuration/hosts/hainich/services/murmur.nix index ba52118..97cd8d1 100644 --- a/configuration/hosts/hainich/services/murmur.nix +++ b/configuration/hosts/hainich/services/murmur.nix @@ -4,7 +4,7 @@ services.murmur = { enable = true; logDays = -1; - welcometext = "Welcome to mumble4future! Brought to you by infra4future"; + welcometext = "Welcome to mumble4future! Brought to you by infra4future. The server is now reachable under mumble.hacc.space, please update your bookmarks."; sslKey = "/var/lib/acme/mumble.hacc.space/key.pem"; sslCert = "/var/lib/acme/mumble.hacc.space/fullchain.pem"; bandwidth = 128000; @@ -14,13 +14,19 @@ networking.firewall.allowedTCPPorts = [ config.services.murmur.port ]; networking.firewall.allowedUDPPorts = [ config.services.murmur.port ]; - services.nginx.virtualHosts."mumble.hacc.space" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "https://stuebinm.4future.dev/mumble.infra4future.de/"; + services.nginx.virtualHosts = + let vhost = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "https://stuebinm.4future.dev/mumble.infra4future.de/"; + }; + }; + in { + "mumble.infra4future.de" = vhost; + "mumble.hacc.space" = vhost; }; - }; + # set ACLs so that the murmur user can read the certificates security.acme.certs."mumble.hacc.space".postRun = "setfacl -Rm u:murmur:rX /var/lib/acme/mumble.hacc.space"; }