Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5021944e7a56
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be34fdfa89f0
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 15, 2018

  1. syslog-ng: fix reload service

    Izorkin committed Aug 15, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    300fe1c View commit details

Commits on Aug 16, 2018

  1. syslog-ng: fix reload service

    Izorkin committed Aug 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e4f4589 View commit details
  2. Merge pull request #45078 from Izorkin/syslog-ng-reload-fix

    syslog-ng: fix reload service
    infinisil authored Aug 16, 2018
    Copy the full SHA
    be34fdf View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 nixos/modules/services/logging/syslog-ng.nix
3 changes: 2 additions & 1 deletion nixos/modules/services/logging/syslog-ng.nix
Original file line number Diff line number Diff line change
@@ -85,10 +85,11 @@ in {
after = [ "multi-user.target" ]; # makes sure hostname etc is set
serviceConfig = {
Type = "notify";
PIDFile = pidFile;
StandardOutput = "null";
Restart = "on-failure";
ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP ${pidFile}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
};
};