openbsd-ports/net/zabbix/patches/patch-misc_conf_zabbix_server_conf

$OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.5 2010/08/22 14:43:24 ajacoutot Exp $
--- misc/conf/zabbix_server.conf.orig	Thu Aug 19 16:37:36 2010
+++ misc/conf/zabbix_server.conf	Thu Aug 19 16:40:20 2010
@@ -36,8 +36,6 @@
 # Default:
 # LogFile=
 
-LogFile=/tmp/zabbix_server.log
-
 ### Option: LogFileSize
 #	Maximum size of log file in MB.
 #	0 - disable automatic log rotation.
@@ -66,6 +64,7 @@ LogFile=/tmp/zabbix_server.log
 # Mandatory: no
 # Default:
 # PidFile=/tmp/zabbix_server.pid
+PidFile=/var/run/zabbix/zabbix_server.pid
 
 ### Option: DBHost
 #	Database host name.
@@ -92,7 +91,7 @@ DBName=zabbix
 # Default:
 # DBUser=
 
-DBUser=root
+DBUser=zabbix
 
 ### Option: DBPassword
 #	Database password. Ignored for SQLite.
@@ -108,6 +107,7 @@ DBUser=root
 # Mandatory: no
 # Default:
 # DBSocket=/tmp/mysql.sock
+DBSocket=/var/www/var/run/mysql/mysql.sock
 
 ### Option: DBPort
 #	Database port when not using local socket. Ignored for SQLite.
@@ -334,6 +334,7 @@ DBUser=root
 # Mandatory: no
 # Default:
 # AlertScriptsPath=/home/zabbix/bin/
+AlertScriptsPath=${SYSCONFDIR}/zabbix/scripts/
 
 ### Option: ExternalScripts
 #	Location of external scripts
@@ -341,6 +342,7 @@ DBUser=root
 # Mandatory: no
 # Default:
 # ExternalScripts=/etc/zabbix/externalscripts
+ExternalScripts=${SYSCONFDIR}/zabbix/externalscripts
 
 ### Option: FpingLocation
 #	Location of fping.
@@ -349,6 +351,7 @@ DBUser=root
 # Mandatory: no
 # Default:
 # FpingLocation=/usr/sbin/fping
+FpingLocation=${LOCALBASE}/sbin/fping
 
 ### Option: Fping6Location
 #	Location of fping6.
@@ -358,6 +361,7 @@ DBUser=root
 # Mandatory: no
 # Default:
 # Fping6Location=/usr/sbin/fping6
+Fping6Location=${LOCALBASE}/sbin/fping6
 
 ### Option: SSHKeyLocation
 #	Location of public keys for SSH checks