diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-07 14:17:16 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-07 14:17:16 +0100 |
| commit | 6690c9756960c15765e39994ba9ae26d989ffe69 (patch) | |
| tree | c0092c241133efc8ad4b2bd6b6511409a78dc95a /nixos | |
| parent | 7e9b24c8f1204b212a5c8b83f395e9be29ebe37e (diff) | |
| parent | 50493458bd0b4f3051cf200e165c007efe7dbade (diff) | |
| download | nixpkgs-6690c9756960c15765e39994ba9ae26d989ffe69.tar nixpkgs-6690c9756960c15765e39994ba9ae26d989ffe69.tar.gz nixpkgs-6690c9756960c15765e39994ba9ae26d989ffe69.tar.bz2 nixpkgs-6690c9756960c15765e39994ba9ae26d989ffe69.tar.lz nixpkgs-6690c9756960c15765e39994ba9ae26d989ffe69.tar.xz nixpkgs-6690c9756960c15765e39994ba9ae26d989ffe69.tar.zst nixpkgs-6690c9756960c15765e39994ba9ae26d989ffe69.zip | |
Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics): pkgs/development/libraries/libusb1/default.nix
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/networking/avahi-daemon.nix | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index d99ad2c9c7c..1563858887e 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -211,6 +211,7 @@ in # Shut down Postgres using SIGINT ("Fast Shutdown mode"). See # http://www.postgresql.org/docs/current/static/server-shutdown.html KillSignal = "SIGINT"; + KillMode = "process"; # FIXME: this may cause processes to be left behind in the cgroup even after the final SIGKILL # Give Postgres a decent amount of time to clean up after # receiving systemd's SIGINT. diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index effd1a62bd9..2256de89630 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -51,7 +51,10 @@ in hostName = mkOption { type = types.str; - description = ''Host name advertised on the LAN.''; + description = '' + Host name advertised on the LAN. If not set, avahi will use the value + of config.networking.hostName. + ''; }; browseDomains = mkOption { |