diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-26 13:32:02 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-26 13:32:02 +0000 |
| commit | b11a33717fc98fffa1f4cf401d036cf8a3a98f45 (patch) | |
| tree | f5bbeaef3dab8157a88f1dc5eee0c51d4c81f83a /modules/services/monitoring | |
| parent | fa344f60d9e51f134adca1e62aeff78d40592885 (diff) | |
| download | nixlib-b11a33717fc98fffa1f4cf401d036cf8a3a98f45.tar nixlib-b11a33717fc98fffa1f4cf401d036cf8a3a98f45.tar.gz nixlib-b11a33717fc98fffa1f4cf401d036cf8a3a98f45.tar.bz2 nixlib-b11a33717fc98fffa1f4cf401d036cf8a3a98f45.tar.lz nixlib-b11a33717fc98fffa1f4cf401d036cf8a3a98f45.tar.xz nixlib-b11a33717fc98fffa1f4cf401d036cf8a3a98f45.tar.zst nixlib-b11a33717fc98fffa1f4cf401d036cf8a3a98f45.zip | |
* zabbix-server: don't require PostgreSQL to be started
if we're using a remote server. svn path=/nixos/trunk/; revision=31852
Diffstat (limited to 'modules/services/monitoring')
| -rw-r--r-- | modules/services/monitoring/zabbix-server.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix index b5af5a2e7bb6..f59558e86dd4 100644 --- a/modules/services/monitoring/zabbix-server.nix +++ b/modules/services/monitoring/zabbix-server.nix @@ -76,8 +76,8 @@ in description = "Zabbix server daemon"; - startOn = "started postgresql"; - stopOn = "stopping postgresql"; + startOn = if cfg.dbServer == "localhost" then "started postgresql" else "filesystem"; + stopOn = if cfg.dbServer == "localhost" then "stopping postgresql" else "starting shutdown"; preStart = '' |