From 791012f209cdcc7af0415cdde7c84184a0c2dede Mon Sep 17 00:00:00 2001 From: eyjhb Date: Wed, 20 Nov 2024 19:19:27 +0100 Subject: [PATCH] murmur: adds hint about teeworlds server --- .../gerd/services/member-website/default.nix | 19 ++++++++++++++++++- machines/gerd/services/murmur.nix | 4 +++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/machines/gerd/services/member-website/default.nix b/machines/gerd/services/member-website/default.nix index ce6f214..4e2ab71 100644 --- a/machines/gerd/services/member-website/default.nix +++ b/machines/gerd/services/member-website/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: let urlpath = "/members"; @@ -24,4 +24,21 @@ in { proxyPass = "http://localhost:${builtins.toString port}"; }; }; + + mine.shared.meta.website-members = { + name = "Members Website"; + description = "This website you are looking at right now, which is our members website."; + url = "https://${config.mine.shared.settings.domain}${urlpath}"; + + package = { + name = "members-website"; + version = "v0.0.1"; + meta = with lib; { + description = "Members website for ${mine.shared.settings.domain}"; + license = licenses.free; + homepage = "https://git.fricloud.dk/fricloud/server-configs/src/branch/main/machines/gerd/services/member-website/app.py"; + platforms = platforms.all; + }; + }; + }; } diff --git a/machines/gerd/services/murmur.nix b/machines/gerd/services/murmur.nix index ff8aa8e..7ee9372 100644 --- a/machines/gerd/services/murmur.nix +++ b/machines/gerd/services/murmur.nix @@ -14,7 +14,9 @@ in { environmentFile = config.age.secrets.murmur-env.path; password = "$MURMUR_PASSWORD"; - welcometext = "Welcome to Friclouds Mumble server!"; + welcometext = ''Welcome to ${config.mine.shared.settings.brand}s Mumble server! + Feel free to join our Teeworlds server while waiting. Credentials can be found on the members website here ${config.mine.shared.meta.website-members.url}. + ''; bandwidth = 130000; };