diff --git a/machines/marabethia/default.nix b/machines/marabethia/default.nix index db92865e..562ddcaf 100644 --- a/machines/marabethia/default.nix +++ b/machines/marabethia/default.nix @@ -91,6 +91,7 @@ git.enable = true; mail.enable = true; matrix.enable = true; + mumble.enable = true; nextcloud.enable = true; nginx.hosts = [ { diff --git a/machines/marabethia/hardware.nix b/machines/marabethia/hardware.nix index f7fe8faf..a8e541b9 100644 --- a/machines/marabethia/hardware.nix +++ b/machines/marabethia/hardware.nix @@ -65,6 +65,10 @@ device = "zroot/safe/services/forgejo"; fsType = "zfs"; }; + "/var/lib/murmur" = { + device = "zroot/local/services/murmur"; + fsType = "zfs"; + }; "/var/vmail" = { device = "zroot/safe/services/mail"; fsType = "zfs"; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 8c23dda0..d52b4cae 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -8,6 +8,7 @@ ./git ./mail ./matrix + ./mumble ./nextcloud ./nginx ./torrents diff --git a/modules/nixos/services/mumble/default.nix b/modules/nixos/services/mumble/default.nix new file mode 100644 index 00000000..23228eab --- /dev/null +++ b/modules/nixos/services/mumble/default.nix @@ -0,0 +1,21 @@ +{ config, pkgs, lib, ... }: + +{ + options.chvp.services.mumble.enable = lib.mkOption { + default = false; + example = true; + }; + + + config = lib.mkIf config.chvp.services.mumble.enable { + services.murmur = { + enable = true; + openFirewall = true; + password = "$MURMURD_PASSWORD"; + }; + age.secrets."passwords/services/murmur" = { + file = ../../../../secrets/passwords/services/murmur.age; + owner = "murmur"; + }; + }; +} diff --git a/secrets.nix b/secrets.nix index b2af858e..a82ecdca 100644 --- a/secrets.nix +++ b/secrets.nix @@ -66,6 +66,8 @@ in "secrets/passwords/services/git/mail-password.age".publicKeys = [ marabethia ] ++ users; "secrets/passwords/services/git/token-file.age".publicKeys = [ elendel ] ++ users; + "secrets/passwords/services/murmur.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/nextcloud-admin.age".publicKeys = [ marabethia ] ++ users; "secrets/passwords/services/data-basic-auth.age".publicKeys = [ elendel ] ++ users; diff --git a/secrets/passwords/services/murmur.age b/secrets/passwords/services/murmur.age new file mode 100644 index 00000000..8d4b6db9 --- /dev/null +++ b/secrets/passwords/services/murmur.age @@ -0,0 +1,10 @@ +age-encryption.org/v1 +-> ssh-ed25519 9+Fe5A XyJjsUUO2h7f++xRBDG49iHLxFxuR9acUOwa9+/1DBU +RRgrX0Vzyvah+bZXIvyYJizEx6YoAn2IahJlTqRjCYc +-> ssh-ed25519 s9rb8g D9Pms7pInTp1a2XzkjnxM1YX9hM+yDfHGfn2vrbIPDs +SLG08eiFDMSO2hegu/aSrWdUW6FfIp3AIY3i0oy9CBE +-> ssh-ed25519 +xxExQ MziN/GpIcgNK8kI8ZXvmLBY7kEhG/JJu9zxv1Aj/mx4 +qgwxeoeXNTvTXiJ9niZg6xbbZ2GspyCZTgTYpN7zkL0 +--- v9mX4yRYWvCIj/tIfM6i3gLmZUWpm+Yj+ks1ecasgDM +eGO*K^ˣ)t1f +ՒRVDR*n6|EE4)IY \ No newline at end of file