From ea0922e8fc51ca526c367378d54b8b74fe4e81eb Mon Sep 17 00:00:00 2001
From: Hugh Day <hjc.day@outlook.com>
Date: Wed, 10 May 2023 13:00:03 +1000
Subject: [PATCH] Add readme, ammend variable name, remove examples

---
 README.md                                  | 1 +
 examples/compose/librenms.env              | 2 --
 examples/rrdcached-server/librenms.env     | 2 --
 examples/traefik/librenms.env              | 2 --
 rootfs/etc/cont-init.d/08-svc-snmptrapd.sh | 2 +-
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 29d703f..ca8950e 100644
--- a/README.md
+++ b/README.md
@@ -132,6 +132,7 @@ Image: librenms/librenms:latest
 * `LOG_IP_VAR`: Use another variable to retrieve the remote IP address for access [log_format](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format) on Nginx. (default `remote_addr`)
 * `SESSION_DRIVER`: [Driver to use for session storage](https://github.com/librenms/librenms/blob/master/config/session.php) (default `file`)
 * `CACHE_DRIVER`: [Driver to use for cache and locks](https://github.com/librenms/librenms/blob/master/config/cache.php) (default `database`)
+* `SNMP_EXTRA_MIB_DIRS`: [Additional directories where MIB files are for SNMP Traps](https://docs.librenms.org/Extensions/SNMP-Trap-Handler/#option-2) (default ``)
 
 ### Redis
 
diff --git a/examples/compose/librenms.env b/examples/compose/librenms.env
index 709ec6e..a1d0492 100644
--- a/examples/compose/librenms.env
+++ b/examples/compose/librenms.env
@@ -14,5 +14,3 @@ LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 
 LIBRENMS_WEATHERMAP=false
 LIBRENMS_WEATHERMAP_SCHEDULE=*/5 * * * *
-
-SNMP_TRAP_MIB_DIRS=/opt/librenms/mibs:/opt/librenms/mibs/cisco
\ No newline at end of file
diff --git a/examples/rrdcached-server/librenms.env b/examples/rrdcached-server/librenms.env
index af10928..44da1f5 100644
--- a/examples/rrdcached-server/librenms.env
+++ b/examples/rrdcached-server/librenms.env
@@ -15,5 +15,3 @@ RRDCACHED_SERVER=rrdcached:42217
 
 LIBRENMS_WEATHERMAP=false
 LIBRENMS_WEATHERMAP_SCHEDULE=*/5 * * * *
-
-SNMP_TRAP_MIB_DIRS=/opt/librenms/mibs:/opt/librenms/mibs/cisco
\ No newline at end of file
diff --git a/examples/traefik/librenms.env b/examples/traefik/librenms.env
index 890397c..d650129 100644
--- a/examples/traefik/librenms.env
+++ b/examples/traefik/librenms.env
@@ -14,5 +14,3 @@ LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 
 LIBRENMS_WEATHERMAP=false
 LIBRENMS_WEATHERMAP_SCHEDULE=*/5 * * * *
-
-SNMP_TRAP_MIB_DIRS=/opt/librenms/mibs:/opt/librenms/mibs/cisco
\ No newline at end of file
diff --git a/rootfs/etc/cont-init.d/08-svc-snmptrapd.sh b/rootfs/etc/cont-init.d/08-svc-snmptrapd.sh
index 92cc138..5c49fdb 100644
--- a/rootfs/etc/cont-init.d/08-svc-snmptrapd.sh
+++ b/rootfs/etc/cont-init.d/08-svc-snmptrapd.sh
@@ -42,6 +42,6 @@ mkdir -p /etc/services.d/snmptrapd
 cat >/etc/services.d/snmptrapd/run <<EOL
 #!/usr/bin/execlineb -P
 with-contenv
-/usr/sbin/snmptrapd -f -m ALL -M ${SNMP_TRAP_MIB_DIRS} udp:162 tcp:162
+/usr/sbin/snmptrapd -f -m ALL -M /opt/librenms/mibs:/opt/librenms/mibs/cisco${SNMP_EXTRA_MIB_DIRS} udp:162 tcp:162
 EOL
 chmod +x /etc/services.d/snmptrapd/run