* Don't set DBHost if the database is on localhost, otherwise Zabbix   will use TCP/IP instead of a Unix domain socket. * Simplify Zabbix's start condition.  Zabbix now retries if the   database is down instead of bailing out.
* Don't set DBHost if the database is on localhost, otherwise Zabbix
  will use TCP/IP instead of a Unix domain socket.
* Simplify Zabbix's start condition.  Zabbix now retries if the
  database is down instead of bailing out.

svn path=/nixos/trunk/; revision=32426

edolstra/nixos,NixOS/nixpkgs,SymbiFlow/nixpkgs,NixOS/nixpkgs,SymbiFlow/nixpkgs,NixOS/nixos,triton/triton,rbvermaa/nixos-svn,SymbiFlow/nixpkgs,NixOS/nixpkgs,SymbiFlow/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,edolstra/nixos,SymbiFlow/nixpkgs,rbvermaa/nixos-svn,NixOS/nixos,NixOS/nixpkgs,NixOS/nixpkgs,andreassalomonsson/nixos,triton/triton,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixos,SymbiFlow/nixpkgs,rbvermaa/nixos-svn,NixOS/nixos,NixOS/nixpkgs,triton/triton,NixOS/nixpkgs,SymbiFlow/nixpkgs,andreassalomonsson/nixos,andreassalomonsson/nixos,SymbiFlow/nixpkgs,andreassalomonsson/nixos,andreassalomonsson/nixos,SymbiFlow/nixpkgs,NixOS/nixos,NixOS/nixpkgs,triton/triton,edolstra/nixos,edolstra/nixos,NixOS/nixpkgs,SymbiFlow/nixpkgs,edolstra/nixos,andreassalomonsson/nixos,rbvermaa/nixos-svn,NixOS/nixos,triton/triton,triton/triton,NixOS/nixpkgs,SymbiFlow/nixpkgs,NixOS/nixpkgs,triton/triton,triton/triton,SymbiFlow/nixpkgs,SymbiFlow/nixpkgs