nixos/murmur: support setting custom state directory (2f0c3c88) · Commits · nix / nixpkgs

nixos/modules/services/networking/murmur.nix

+14 −6

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ let
		cfg = config.services.murmur;
		forking = cfg.logFile != null;
		configFile = pkgs.writeText "murmurd.ini" ''
		database=/var/lib/murmur/murmur.sqlite
		database=${cfg.stateDir}/murmur.sqlite
		dbDriver=QSQLITE

		autobanAttempts=${toString cfg.autobanAttempts}
		@@ -69,6 +69,14 @@ in
		'';
		};

		stateDir = mkOption {
		type = types.path;
		default = "/var/lib/murmur";
		description = ''
		Directory to store data for the server.
		'';
		};

		autobanAttempts = mkOption {
		type = types.int;
		default = 10;
		@@ -257,7 +265,7 @@ in
		environmentFile = mkOption {
		type = types.nullOr types.path;
		default = null;
		example = "/var/lib/murmur/murmurd.env";
		example = literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"'';
		description = ''
		Environment file as defined in {manpage}`systemd.exec(5)`.

		@@ -291,7 +299,7 @@ in
		config = mkIf cfg.enable {
		users.users.murmur = {
		description = "Murmur Service user";
		home = "/var/lib/murmur";
		home = cfg.stateDir;
		createHome = true;
		uid = config.ids.uids.murmur;
		group = "murmur";
		@@ -387,9 +395,9 @@ in

		r ${config.environment.etc."os-release".source},
		r ${config.environment.etc."lsb-release".source},
		owner rwk /var/lib/murmur/murmur.sqlite,
		owner rw /var/lib/murmur/murmur.sqlite-journal,
		owner r /var/lib/murmur/,
		owner rwk ${cfg.stateDir}/murmur.sqlite,
		owner rw ${cfg.stateDir}/murmur.sqlite-journal,
		owner r ${cfg.stateDir}/,
		r /run/murmur/murmurd.pid,
		r /run/murmur/murmurd.ini,
		r ${configFile},