2010-12-27 12:19:17 -05:00
|
|
|
$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.6 2010/12/27 17:19:17 ajacoutot Exp $
|
|
|
|
--- misc/conf/zabbix_proxy.conf.orig Thu Dec 23 17:51:28 2010
|
|
|
|
+++ misc/conf/zabbix_proxy.conf Mon Dec 27 16:19:44 2010
|
|
|
|
@@ -94,6 +94,7 @@ LogFile=/tmp/zabbix_proxy.log
|
2010-01-11 13:30:01 -05:00
|
|
|
# Mandatory: no
|
|
|
|
# Default:
|
|
|
|
# PidFile=/tmp/zabbix_proxy.pid
|
|
|
|
+PidFile=/var/run/zabbix/zabbix_proxy.pid
|
2009-04-23 11:38:11 -04:00
|
|
|
|
2010-01-11 13:30:01 -05:00
|
|
|
### Option: DBHost
|
|
|
|
# Database host name.
|
2010-12-27 12:19:17 -05:00
|
|
|
@@ -126,7 +127,7 @@ DBName=zabbix
|
2010-01-11 13:30:01 -05:00
|
|
|
# Default:
|
|
|
|
# DBUser=
|
2009-07-12 15:51:51 -04:00
|
|
|
|
2010-01-11 13:30:01 -05:00
|
|
|
-DBUser=root
|
|
|
|
+DBUser=zabbix
|
2009-07-12 15:51:51 -04:00
|
|
|
|
2010-01-11 13:30:01 -05:00
|
|
|
### Option: DBPassword
|
|
|
|
# Database password. Ignored for SQLite.
|
2010-12-27 12:19:17 -05:00
|
|
|
@@ -142,6 +143,7 @@ DBUser=root
|
2010-01-11 13:30:01 -05:00
|
|
|
# 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.
|
2010-12-27 12:19:17 -05:00
|
|
|
@@ -380,6 +382,7 @@ DBUser=root
|
2010-01-11 13:30:01 -05:00
|
|
|
# Mandatory: no
|
|
|
|
# Default:
|
|
|
|
# ExternalScripts=/etc/zabbix/externalscripts
|
2009-07-12 15:51:51 -04:00
|
|
|
+ExternalScripts=${SYSCONFDIR}/zabbix/externalscripts
|
|
|
|
|
2010-01-11 13:30:01 -05:00
|
|
|
### Option: FpingLocation
|
|
|
|
# Location of fping.
|
2010-12-27 12:19:17 -05:00
|
|
|
@@ -388,6 +391,7 @@ DBUser=root
|
2010-01-11 13:30:01 -05:00
|
|
|
# Mandatory: no
|
|
|
|
# Default:
|
|
|
|
# FpingLocation=/usr/sbin/fping
|
2009-07-12 15:51:51 -04:00
|
|
|
+FpingLocation=${LOCALBASE}/sbin/fping
|
|
|
|
|
2010-01-11 13:30:01 -05:00
|
|
|
### Option: Fping6Location
|
|
|
|
# Location of fping6.
|
2010-12-27 12:19:17 -05:00
|
|
|
@@ -397,6 +401,7 @@ DBUser=root
|
2010-01-11 13:30:01 -05:00
|
|
|
# Mandatory: no
|
|
|
|
# Default:
|
|
|
|
# Fping6Location=/usr/sbin/fping6
|
2010-08-22 10:43:23 -04:00
|
|
|
+Fping6Location=${LOCALBASE}/sbin/fping6
|
2009-07-12 15:51:51 -04:00
|
|
|
|
2010-01-11 13:30:01 -05:00
|
|
|
### Option: SSHKeyLocation
|
|
|
|
# Location of public keys for SSH checks
|