diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
| commit | a26c8e9b835647ae39d4259cfd55e8001ee57b93 (patch) | |
| tree | 55fe17fed5fc7625146a47e7f0e14b6581c18473 /nixos | |
| parent | fa5ad20922cbc2b4ffbbb74edbc22d650d80441d (diff) | |
| parent | 9fd510e95ad8dd2d0e4c92f12fd9249594c30f23 (diff) | |
| download | nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.gz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.bz2 nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.lz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.xz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.zst nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/monitoring/bosun.nix | 10 | ||||
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/networking/quassel.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/networking/wakeonlan.nix | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 7e8dea4ec024..ebe4741f01bd 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -9,7 +9,7 @@ let tsdbHost = ${cfg.opentsdbHost} httpListen = ${cfg.listenAddress} stateFile = ${cfg.stateFile} - checkFrequency = 5m + checkFrequency = ${cfg.checkFrequency} ${cfg.extraConfig} ''; @@ -77,6 +77,14 @@ in { ''; }; + checkFrequency = mkOption { + type = types.str; + default = "5m"; + description = '' + Bosun's check frequency + ''; + }; + extraConfig = mkOption { type = types.string; default = ""; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 96f1e2ded93e..32491401530c 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -6,7 +6,8 @@ with lib; let cfg = config.networking.networkmanager; - stateDirs = "/var/lib/NetworkManager /var/lib/dhclient"; + # /var/lib/misc is for dnsmasq.leases. + stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; configFile = writeText "NetworkManager.conf" '' [main] diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 005eb7bd7614..15db2d5346b8 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -78,7 +78,8 @@ in { description = "Quassel IRC client daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" ] ++ optional config.services.postgresql.enable "postgresql.service" + ++ optional config.services.mysql.enable "mysql.service"; preStart = '' mkdir -p ${cfg.dataDir} diff --git a/nixos/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix index 11bb7e925255..ebfba263cd8f 100644 --- a/nixos/modules/services/networking/wakeonlan.nix +++ b/nixos/modules/services/networking/wakeonlan.nix @@ -40,7 +40,7 @@ in ]; description = '' Interfaces where to enable Wake-On-LAN, and how. Two methods available: - "magickey" and "password". The password has the shape of six bytes + "magicpacket" and "password". The password has the shape of six bytes in hexadecimal separated by a colon each. For more information, check the ethtool manual. ''; |