chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 18:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

nixos/tlsrpt: fix restart trigger

Browse Source 
Triggering on a symlink target does not work.
This commit is contained in:
Martin Weinelt
2025-07-27 17:36:00 +02:00
parent 1f9431801f
commit c3c5a3bfd0
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
nixos/modules/services/mail/tlsrpt.nix
View File

@@ -50,6 +50,15 @@ let
];
};
collectdConfigFile = format.generate "tlsrpt-collectd.cfg" {
tlsrpt_collectd = dropNullValues cfg.collectd.settings;
};
fetcherConfigFile = format.generate "tlsrpt-fetcher.cfg" {
tlsrpt_fetcher = dropNullValues cfg.fetcher.settings;
};
reportdConfigFile = format.generate "tlsrpt-reportd.cfg" {
tlsrpt_reportd = dropNullValues cfg.reportd.settings;
};
in
{
@@ -266,15 +275,9 @@ in
config = mkIf cfg.enable {
environment.etc = {
"tlsrpt/collectd.cfg".source = format.generate "tlsrpt-collectd.cfg" {
tlsrpt_collectd = dropNullValues cfg.collectd.settings;
};
"tlsrpt/fetcher.cfg".source = format.generate "tlsrpt-fetcher.cfg" {
tlsrpt_fetcher = dropNullValues cfg.fetcher.settings;
};
"tlsrpt/reportd.cfg".source = format.generate "tlsrpt-reportd.cfg" {
tlsrpt_reportd = dropNullValues cfg.reportd.settings;
};
"tlsrpt/collectd.cfg".source = collectdConfigFile;
"tlsrpt/fetcher.cfg".source = fetcherConfigFile;
"tlsrpt/reportd.cfg".source = reportdConfigFile;
};
users.users.tlsrpt = {
@@ -295,7 +298,7 @@ in
wantedBy = [ "multi-user.target" ];
restartTriggers = [ "/etc/tlsrpt/collectd.cfg" ];
restartTriggers = [ collectdConfigFile ];
serviceConfig = commonServiceSettings // {
ExecStart = toString (
@@ -319,7 +322,7 @@ in
wantedBy = [ "multi-user.target" ];
restartTriggers = [ "/etc/tlsrpt/reportd.cfg" ];
restartTriggers = [ reportdConfigFile ];
serviceConfig = commonServiceSettings // {
ExecStart = toString (