diff options
| author | Peter Hoeg <peter@hoeg.com> | 2019-03-01 18:54:24 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2019-03-01 18:54:24 +0800 |
| commit | 0e40b7bfc2004a5448aa3883a528e2b381d9d877 (patch) | |
| tree | 166f27632dbefec0280a4826715592ba4563c360 /nixos/modules/services/networking/mosquitto.nix | |
| parent | 5638a1c71738013e96a51b07ce7a39d76a33448c (diff) | |
| download | nixpkgs-0e40b7bfc2004a5448aa3883a528e2b381d9d877.tar nixpkgs-0e40b7bfc2004a5448aa3883a528e2b381d9d877.tar.gz nixpkgs-0e40b7bfc2004a5448aa3883a528e2b381d9d877.tar.bz2 nixpkgs-0e40b7bfc2004a5448aa3883a528e2b381d9d877.tar.lz nixpkgs-0e40b7bfc2004a5448aa3883a528e2b381d9d877.tar.xz nixpkgs-0e40b7bfc2004a5448aa3883a528e2b381d9d877.tar.zst nixpkgs-0e40b7bfc2004a5448aa3883a528e2b381d9d877.zip | |
mosquitto (nixos): notify systemd when started
Diffstat (limited to 'nixos/modules/services/networking/mosquitto.nix')
| -rw-r--r-- | nixos/modules/services/networking/mosquitto.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 332dc541345..9974cbd89d1 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -17,7 +17,6 @@ let ''; mosquittoConf = pkgs.writeText "mosquitto.conf" '' - pid_file /run/mosquitto/pid acl_file ${aclFile} persistence true allow_anonymous ${boolToString cfg.allowAnonymous} @@ -196,15 +195,15 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - Type = "forking"; + Type = "notify"; + NotifyAccess = "main"; User = "mosquitto"; Group = "mosquitto"; RuntimeDirectory = "mosquitto"; WorkingDirectory = cfg.dataDir; Restart = "on-failure"; - ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf} -d"; + ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - PIDFile = "/run/mosquitto/pid"; }; preStart = '' rm -f ${cfg.dataDir}/passwd @@ -214,7 +213,7 @@ in if c.hashedPassword != null then "echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd" else optionalString (c.password != null) - "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} ${c.password}" + "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} '${c.password}'" ) cfg.users); }; |