diff --git a/hosts/deertopia/configuration.nix b/hosts/deertopia/configuration.nix index ec92198..79eda25 100644 --- a/hosts/deertopia/configuration.nix +++ b/hosts/deertopia/configuration.nix @@ -59,6 +59,7 @@ syncthing.enable = true; cache.enable = true; # mullvad.enable = true; + # umurmur.enable = true; murmur.enable = true; servarr = { enable = true; diff --git a/modules/nixos/deertopia/murmur.nix b/modules/nixos/deertopia/murmur.nix index 4d6b29c..4debe5f 100644 --- a/modules/nixos/deertopia/murmur.nix +++ b/modules/nixos/deertopia/murmur.nix @@ -11,27 +11,25 @@ in { config = lib.mkIf cfg.enable { sydnix.impermanence.directories = [ - "/var/lib/private/umurmur" + config.services.murmur.stateDir ]; - # HACK: Allow uMurmur to use Nginx's certs. - systemd.services.umurmur.serviceConfig.SupplementaryGroups = [ "nginx" ]; + # HACK: Allow Murmur to use Nginx's certs. + systemd.services.murmur.serviceConfig.SupplementaryGroups = [ "nginx" ]; - services.umurmur = { + services.murmur = { enable = true; openFirewall = true; - settings = { - password = "onlydeer"; - bindport = 64738; # Use default Murmur port, not uMurmur's. - welcometext = "🦌"; + password = "onlydeer"; + port = 64738; + welcometext = "🦌"; - max_bandwidth = 72000; + bandwidth = 72000; - # Use files generated by Nix's Nginx module. - certificate = "/var/lib/acme/deertopia.net/fullchain.pem"; - private_key = "/var/lib/acme/deertopia.net/key.pem"; - }; + # Use files generated by Nix's Nginx module. + sslCert = "/var/lib/acme/deertopia.net/fullchain.pem"; + sslKey = "/var/lib/acme/deertopia.net/key.pem"; }; }; } diff --git a/modules/nixos/deertopia/umurmur.nix b/modules/nixos/deertopia/umurmur.nix new file mode 100644 index 0000000..2169934 --- /dev/null +++ b/modules/nixos/deertopia/umurmur.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +let cfg = config.sydnix.deertopia.umurmur; +in { + options = { + sydnix.deertopia.umurmur = { + enable = lib.mkEnableOption "Deertopia's uMurmur, a Mumble server"; + }; + }; + + config = lib.mkIf cfg.enable { + + sydnix.impermanence.directories = [ + "/var/lib/private/umurmur" + ]; + + # HACK: Allow uMurmur to use Nginx's certs. + systemd.services.umurmur.serviceConfig.SupplementaryGroups = [ "nginx" ]; + + services.umurmur = { + enable = true; + openFirewall = true; + + settings = { + password = "onlydeer"; + bindport = 64738; # Use default Murmur port, not uMurmur's. + welcometext = "🦌"; + + max_bandwidth = 72000; + + # Use files generated by Nix's Nginx module. + certificate = "/var/lib/acme/deertopia.net/fullchain.pem"; + private_key = "/var/lib/acme/deertopia.net/key.pem"; + }; + }; + }; +}