From 67831450defa634a5f406fcc936042f31c7119d8 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 6 May 2011 09:59:37 +0000
Subject: [PATCH] unfuck ipmi and update changelog and snmp.conf.example

git-svn-id: http://www.observium.org/svn/observer/trunk@2261 61d68cd4-352d-0410-923a-c4978735b2b8
---
 CHANGELOG                       | 4 +++-
 includes/discovery/ipmi.inc.php | 2 ++
 snmp.conf.example               | 2 +-
 snmpd.conf.example              | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index da3f8ccfbf..1915dcc71b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,12 +2,14 @@ For more granular updates check:
 
 http://www.observium.org/websvn/listing.php?repname=observer
 
+SVN
+
 0.10.5.2248 ( 5th May 2011 )
 
 * Improve poller/discovery
 * Improve option bar option highlighting
 * Add support for OSPF discovery
-* Add support for CEF switching statistics
+* Add support for CEF switching statistics from CISCO-CEF-MIB
 * Add support for UDP6 transport (and others) for SNMP.
 * Improved Microsoft Windows detection.
 * Juniper ScreenOS CPU/Memory.
diff --git a/includes/discovery/ipmi.inc.php b/includes/discovery/ipmi.inc.php
index 18efa15299..8f84dcb371 100644
--- a/includes/discovery/ipmi.inc.php
+++ b/includes/discovery/ipmi.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+global $ipmi_unit;
+
 ## IPMI
 if ($ipmi['host'] = get_dev_attrib($device,'ipmi_hostname'))
 {
diff --git a/snmp.conf.example b/snmp.conf.example
index 13f51a1087..c5c5ba357f 100644
--- a/snmp.conf.example
+++ b/snmp.conf.example
@@ -1 +1 @@
-mibdirs +/opt/observer/mibs
+mibdirs +/opt/observium/mibs
diff --git a/snmpd.conf.example b/snmpd.conf.example
index b347842aa4..04512759d7 100644
--- a/snmpd.conf.example
+++ b/snmpd.conf.example
@@ -1,4 +1,4 @@
-com2sec readonly  default         m3m3t1c
+com2sec readonly  default         0bs3rv1um
 
 group MyROGroup v2c        readonly
 view all    included  .1                               80