f5a0b77fbe
Details available at: http://www.zabbix.com/documentation/1.8/manual/about/what_s_new_1.8.4 We are updating now because this release brings lots of fixes and integrates robert@'s patches for sensors and network statistics. Used in production for several weeks now. Final 1.8.4 is scheduled to be released shortly. ok robert@
70 lines
1.7 KiB
Plaintext
70 lines
1.7 KiB
Plaintext
$OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.6 2010/12/27 17:19:17 ajacoutot Exp $
|
|
--- misc/conf/zabbix_server.conf.orig Thu Dec 23 17:51:28 2010
|
|
+++ misc/conf/zabbix_server.conf Mon Dec 27 16:19:44 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.
|
|
@@ -99,7 +98,7 @@ DBName=zabbix
|
|
# Default:
|
|
# DBUser=
|
|
|
|
-DBUser=root
|
|
+DBUser=zabbix
|
|
|
|
### Option: DBPassword
|
|
# Database password. Ignored for SQLite.
|
|
@@ -115,6 +114,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.
|
|
@@ -346,6 +346,7 @@ DBUser=root
|
|
# Mandatory: no
|
|
# Default:
|
|
# AlertScriptsPath=/home/zabbix/bin/
|
|
+AlertScriptsPath=${SYSCONFDIR}/zabbix/scripts/
|
|
|
|
### Option: ExternalScripts
|
|
# Location of external scripts
|
|
@@ -353,6 +354,7 @@ DBUser=root
|
|
# Mandatory: no
|
|
# Default:
|
|
# ExternalScripts=/etc/zabbix/externalscripts
|
|
+ExternalScripts=${SYSCONFDIR}/zabbix/externalscripts
|
|
|
|
### Option: FpingLocation
|
|
# Location of fping.
|
|
@@ -361,6 +363,7 @@ DBUser=root
|
|
# Mandatory: no
|
|
# Default:
|
|
# FpingLocation=/usr/sbin/fping
|
|
+FpingLocation=${LOCALBASE}/sbin/fping
|
|
|
|
### Option: Fping6Location
|
|
# Location of fping6.
|
|
@@ -370,6 +373,7 @@ DBUser=root
|
|
# Mandatory: no
|
|
# Default:
|
|
# Fping6Location=/usr/sbin/fping6
|
|
+Fping6Location=${LOCALBASE}/sbin/fping6
|
|
|
|
### Option: SSHKeyLocation
|
|
# Location of public keys for SSH checks
|