From 615fefb3a5559f2acbd6b2e6dd356cd569d70d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Mon, 9 Apr 2018 14:19:42 +0200 Subject: [PATCH] nixos/prosody: add dataDir option --- nixos/modules/services/networking/prosody.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index d57ebb61f63..f409962816d 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -295,6 +295,12 @@ in ''; }; + dataDir = mkOption { + type = types.string; + description = "Directory where Prosody stores its data"; + default = "/var/lib/prosody"; + }; + allowRegistration = mkOption { type = types.bool; default = false; @@ -421,11 +427,11 @@ in environment.etc."prosody/prosody.cfg.lua".text = '' - pidfile = "/var/lib/prosody/prosody.pid" + pidfile = "${cfg.dataDir}/prosody.pid" log = "*syslog" - data_path = "/var/lib/prosody" + data_path = "${cfg.dataDir}" plugin_paths = { ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.extraPluginPaths) } } @@ -474,7 +480,7 @@ in description = "Prosody user"; createHome = true; group = "prosody"; - home = "/var/lib/prosody"; + home = "${cfg.dataDir}"; }; users.extraGroups.prosody = { @@ -490,7 +496,7 @@ in serviceConfig = { User = "prosody"; Type = "forking"; - PIDFile = "/var/lib/prosody/prosody.pid"; + PIDFile = "${cfg.dataDir}/prosody.pid"; ExecStart = "${cfg.package}/bin/prosodyctl start"; }; };