Commit graph

59 commits

Author SHA1 Message Date
Thomas Gerbet 59f9c6722b
nixos/murmur: Set ProtectControlGroups to strict (#448637) 2025-10-08 06:00:22 +00:00
Felix Singer 05c5d78068 nixos/murmur: Set ProtectControlGroups to strict
For documentation see
https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#ProtectControlGroups=

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-10-04 23:22:11 +02:00
Felix Singer 21d81266c2 nixos/murmur: Enable PrivateMounts hardening in service config
Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-10-04 11:44:05 +02:00
Felix Singer 5896ce3bca nixos/murmur: Use lib.types.path where possible
Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-09-22 20:11:59 +02:00
Niklas Korz a4ced97842
nixos/murmur: Set ProtectSystem to strict (#442008) 2025-09-22 16:35:49 +00:00
Felix Singer 5b0ee7f9c4 nixos/murmur: Set ProtectSystem to strict
Make the whole file system read-only except the directories related to
Murmur, like the state or runtime directories.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-09-22 05:12:43 +02:00
Felix Singer 7c45736347 nixos/murmur: Fix typo in mkRemovedOptionModule message
Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-09-22 05:07:23 +02:00
Grimmauld c754dfa101
nixos/murmur: Hard-code log directory to /var/log/murmur (#442806) 2025-09-17 17:38:10 +00:00
Felix Singer f6d9a910e6 nixos/murmur: Hard-code log directory to /var/log/murmur
The Murmur NixOS module allows logging to a file instead of journald. At
the moment any arbitrary directory may be specified by using the
`logfile` option, but nothing ensures that the directory exists or
proper permissions are configured.

Since there is not much reason to specify a custom directory for log
files anyway, just use `/var/log/murmur` by using the systemd way. This
replaces the option `logfile` with the boolean option `logToFile` as
well.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-09-14 06:59:46 +02:00
Felix Singer 9309fd7508 nixos/murmur: Reverse order of allowed address families
Instead of specifying what shouldn't be allowed, rather list allowed
address families.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-09-11 09:14:00 +02:00
Wolfgang Walther 5a0711127c
treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Felix Singer 31d18149ad nixos/murmur: Drop warnings regarding renamed/removed options
These warnings were added around 5 years ago. That's long enough. So
drop them.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-06-06 07:52:35 +02:00
Felix Singer b6c81af12d nixos/murmur: Get rid global lib expansion
Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-06-06 07:52:35 +02:00
Felix Singer 1c9df5c6de nixos/murmur: Use lib.mkEnableOption where possible
While on it, replace occurrences of "Murmur" with "Mumble server" of
touched options.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-06-06 07:52:35 +02:00
K900 716d4db111
Revert "nixos/murmur: Get rid of global lib expansion" 2025-06-03 09:13:00 +03:00
Felix Singer 7c7c839a26 nixos/murmur: Drop warnings regarding renamed/removed options
These warnings were added around 5 years ago. That's long enough. So
drop them.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-05-31 21:15:21 +02:00
Felix Singer f13ada1223 nixos/murmur: Get rid global lib expansion
Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-05-31 21:15:21 +02:00
Felix Singer 9bca318775 nixos/murmur: Use lib.mkEnableOption where possible
While on it, replace occurrences of "Murmur" with "Mumble server" of
touched options.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-05-31 21:15:21 +02:00
Silvan Mosberger 374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
DCsunset acda73926d nixos/murmur: support setting user and group for service 2024-10-30 08:21:48 +00:00
DCsunset 2f0c3c88cb nixos/murmur: support setting custom state directory 2024-10-30 08:21:48 +00:00
Felix Singer 13f6e2d85f nixos/murmur: Set UMask to 027
Group only needs limited access, while other users don't need access at
all. So set the UMask to 027.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2024-10-15 02:43:42 +02:00
Felix Singer 421d1b8974 nixos/{redmine,murmur}: Add Felix Singer as maintainer
I'm maintaining the associated packages. So it makes sense to add myself
to their modules as well.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
2024-09-22 08:35:08 +02:00
stuebinm 6afb255d97 nixos: remove all uses of lib.mdDoc
these changes were generated with nixq 0.0.2, by running

  nixq ">> lib.mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> Inherit >> mdDoc[remove]" --batchmode nixos/**.nix

two mentions of the mdDoc function remain in nixos/, both of which
are inside of comments.

Since lib.mdDoc is already defined as just id, this commit is a no-op as
far as Nix (and the built manual) is concerned.
2024-04-13 10:07:35 -07:00
Felix Buehler 1e22e7d75e nixos/murmur: fix writing registerPassword to config 2024-03-12 21:19:24 +01:00
360ied 11cf6ab0dd nixos/murmur: systemd service hardening
Murmur provides an official systemd service file in their repo,
which contains various service hardening settings:

c4b5858d14/auxiliary_files/config_files/mumble-server.service.in (L7)

The service configuration in nixpkgs does not include these hardening settings.

This commit adds the hardening settings to the murmur service in nixpkgs.
This drops the `systemd-analyze security` score of murmur.service from 9.2 (UNSAFE) to 2.1 (OK).
2024-02-04 21:23:34 -05:00
h7x4 0a37316d6c
treewide: use mkPackageOption
This commit replaces a lot of usages of `mkOption` with the package
type, to be `mkPackageOption`, in order to reduce the amount of code.
2023-11-27 01:28:36 +01:00
ajs124 bf4d2e6c1e
Merge pull request #242538 from tnias/fix/apparmor
apparmor: add some policies and improve abstractions and utils
2023-08-04 13:05:52 +02:00
Philipp Bartsch 30ad9053ab nixos/murmur: add apparmor policy 2023-07-13 11:11:01 +02:00
Felix Buehler f3719756b5 treewide: use optionalString instead of 'then ""' 2023-06-24 20:19:19 +02:00
Lin Jian 0ae9df6c5e
nixos/murmur: make it be after network.target again
network.target was changed to network-online.target in this PR[1] to
workaround an issue[2].

The murmur version in Nixpkgs has fixed that issue[2].

[1]: https://github.com/NixOS/nixpkgs/pull/42860
[2]: https://github.com/mumble-voip/mumble/issues/1629
2023-05-28 21:03:40 +08:00
K900 d8d8b55e7d nixos/murmur: expose dbus 2023-03-08 18:03:51 +03:00
pennae f2ea09ecbe nixos/*: convert options with listings
minor rendering changes.
2022-08-31 17:27:36 +02:00
pennae 7e7d68a250 nixos/*: mark pre-existing markdown descriptions as mdDoc 2022-08-19 22:40:58 +02:00
pennae 423545fe48 nixos/*: normalize manpage references to single-line form
now nix-doc-munge will not introduce whitespace changes when it replaces
manpage references with the MD equivalent.

no change to the manpage, changes to the HTML manual are whitespace only.
2022-08-05 18:34:50 +02:00
pennae 2e751c0772 treewide: automatically md-convert option descriptions
the conversion procedure is simple:

 - find all things that look like options, ie calls to either `mkOption`
   or `lib.mkOption` that take an attrset. remember the attrset as the
   option
 - for all options, find a `description` attribute who's value is not a
   call to `mdDoc` or `lib.mdDoc`
 - textually convert the entire value of the attribute to MD with a few
   simple regexes (the set from mdize-module.sh)
 - if the change produced a change in the manual output, discard
 - if the change kept the manual unchanged, add some text to the
   description to make sure we've actually found an option. if the
   manual changes this time, keep the converted description

this procedure converts 80% of nixos options to markdown. around 2000
options remain to be inspected, but most of those fail the "does not
change the manual output check": currently the MD conversion process
does not faithfully convert docbook tags like <code> and <package>, so
any option using such tags will not be converted at all.
2022-07-30 15:16:34 +02:00
Felix Buehler 17e93b090e services.murmur: add openFirewall option 2022-07-24 10:32:37 +02:00
Felix Singer c267e9ce37 mumble,murmur: 1.3.4 -> 1.4.231
Update version to 1.4.231.

Build 231 points to a specific commit from the 1.4.x branch adding many
fixes and improvements. Since this version is an unofficial release, add
an unstable prefix to the version string in Nixpkgs.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
2022-02-26 22:08:22 +01:00
K900 e68a2fffa1 nixos/murmur: remove extra space, fix build after #152372 2022-02-01 07:07:51 +00:00
Naïm Favier 2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
Daniel Nagy 06962df4d2
nixos/murmur: use port type 2021-06-18 17:30:33 +02:00
Philipp 06c0f16555
nixos/murmur: Add overrideable package switch 2021-01-11 00:08:23 +01:00
Philipp fc856b89e5
nixos/murmur: add murmur group, don't run as nogroup
fixes #101980
2020-10-29 10:32:04 +01:00
elseym 533560de5b
nixos/murmur: add option environmentFile for injecting secrets
Secrets are injected from the environment into the rendered
configuration before each startup using envsubst.
The test now makes use of this feature for the server password.
2020-10-07 13:35:50 +02:00
Silvan Mosberger 4ee3e8b21d
nixos/treewide: Move rename.nix imports to their respective modules
A centralized list for these renames is not good because:
- It breaks disabledModules for modules that have a rename defined
- Adding/removing renames for a module means having to find them in the
central file
- Merge conflicts due to multiple people editing the central file
2019-12-10 02:51:19 +01:00
Nikolay Amiantov daa9ea2987 murmur service: fix typo in description 2019-09-06 20:29:20 +03:00
Nikolay Amiantov f23c110692 murmur service: log to journald by default
Save an option to log to file with new `logFile` option.

As a side effect deprecate `pidfile` option and instead use systemd's
RuntimeDirectory.
2019-05-30 15:43:32 +03:00
Linus Heckemann 68a2fceed5 nixos/murmur: mention mumble in description
This makes the option easier to find with the options search or in the
manpage.
2018-10-08 13:33:36 +02:00
Silvan Mosberger bdac6ac4b2
Merge pull request #42860 from ldesgoui/fix-murmur-service
murmur service: prevent silent launch failure by waiting until network is available
2018-07-03 17:34:07 +02:00
ldesgoui 16a46139d3 murmur: prevent silent launch failure 2018-07-02 05:30:43 +02:00