|
 |
75e927 |
From 039f85dfe9a09478c9581b87113e73e2205abd53 Mon Sep 17 00:00:00 2001
|
|
|
75e927 |
From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
|
|
|
75e927 |
Date: Thu, 16 Oct 2014 13:59:51 +0300
|
|
|
75e927 |
Subject: [PATCH 3/4] raddb: Use appropriate module names in traps
|
|
|
75e927 |
|
|
|
75e927 |
Specify appropriate module names for all module traps in trigger.conf,
|
|
|
75e927 |
instead of using "ldap" for all.
|
|
|
75e927 |
---
|
|
|
75e927 |
raddb/trigger.conf | 29 +++++++++++++++++++----------
|
|
|
75e927 |
1 file changed, 19 insertions(+), 10 deletions(-)
|
|
|
75e927 |
|
|
|
75e927 |
diff --git a/raddb/trigger.conf b/raddb/trigger.conf
|
|
|
75e927 |
index b80089c..44f9f36 100644
|
|
|
75e927 |
--- a/raddb/trigger.conf
|
|
|
75e927 |
+++ b/raddb/trigger.conf
|
|
|
75e927 |
@@ -194,12 +194,15 @@ trigger {
|
|
|
75e927 |
# "trigger" subsection in the module configuration.
|
|
|
75e927 |
modules {
|
|
|
75e927 |
# Common arguments
|
|
|
75e927 |
- args = "radiusdModuleName s ldap radiusdModuleInstance s ''"
|
|
|
75e927 |
+ args = "radiusdModuleInstance s ''"
|
|
|
75e927 |
|
|
|
75e927 |
# The files module
|
|
|
75e927 |
files {
|
|
|
75e927 |
+ # Common arguments
|
|
|
75e927 |
+ args = "radiusdModuleName s files ${..args}"
|
|
|
75e927 |
+
|
|
|
75e927 |
# The module has been HUP'd via radmin
|
|
|
75e927 |
- hup = "${snmptrap}::serverModuleHup ${..args}"
|
|
|
75e927 |
+ hup = "${snmptrap}::serverModuleHup ${args}"
|
|
|
75e927 |
|
|
|
75e927 |
# Note that "hup" can be used for every module
|
|
|
75e927 |
# which can be HUP'd via radmin
|
|
|
75e927 |
@@ -210,32 +213,38 @@ trigger {
|
|
|
75e927 |
# an LDAP connection ofr every "bind as user". Be aware that
|
|
|
75e927 |
# this will likely produce a lot of triggers.
|
|
|
75e927 |
ldap {
|
|
|
75e927 |
+ # Common arguments
|
|
|
75e927 |
+ args = "radiusdModuleName s ldap ${..args}"
|
|
|
75e927 |
+
|
|
|
75e927 |
# A new connection to the DB has been opened
|
|
|
75e927 |
- open = "${snmptrap}::serverModuleConnectionUp ${..args}"
|
|
|
75e927 |
+ open = "${snmptrap}::serverModuleConnectionUp ${args}"
|
|
|
75e927 |
|
|
|
75e927 |
# A connection to the DB has been closed
|
|
|
75e927 |
- close = "${snmptrap}::serverModuleConnectionDown ${..args}"
|
|
|
75e927 |
+ close = "${snmptrap}::serverModuleConnectionDown ${args}"
|
|
|
75e927 |
|
|
|
75e927 |
# Failed to open a new connection to the DB
|
|
|
75e927 |
- fail = "${snmptrap}::serverModuleConnectionFail ${..args}"
|
|
|
75e927 |
+ fail = "${snmptrap}::serverModuleConnectionFail ${args}"
|
|
|
75e927 |
|
|
|
75e927 |
# There are no DB handles available.
|
|
|
75e927 |
- none = "${snmptrap}::serverModuleConnectionNone ${..args}"
|
|
|
75e927 |
+ none = "${snmptrap}::serverModuleConnectionNone ${args}"
|
|
|
75e927 |
}
|
|
|
75e927 |
|
|
|
75e927 |
# The SQL module
|
|
|
75e927 |
sql {
|
|
|
75e927 |
+ # Common arguments
|
|
|
75e927 |
+ args = "radiusdModuleName s sql ${..args}"
|
|
|
75e927 |
+
|
|
|
75e927 |
# A new connection to the DB has been opened
|
|
|
75e927 |
- open = "${snmptrap}::serverModuleConnectionUp ${..args}"
|
|
|
75e927 |
+ open = "${snmptrap}::serverModuleConnectionUp ${args}"
|
|
|
75e927 |
|
|
|
75e927 |
# A connection to the DB has been closed
|
|
|
75e927 |
- close = "${snmptrap}::serverModuleConnectionDown ${..args}"
|
|
|
75e927 |
+ close = "${snmptrap}::serverModuleConnectionDown ${args}"
|
|
|
75e927 |
|
|
|
75e927 |
# Failed to open a new connection to the DB
|
|
|
75e927 |
- fail = "${snmptrap}::serverModuleConnectionFail ${..args}"
|
|
|
75e927 |
+ fail = "${snmptrap}::serverModuleConnectionFail ${args}"
|
|
|
75e927 |
|
|
|
75e927 |
# There are no DB handles available.
|
|
|
75e927 |
- none = "${snmptrap}::serverModuleConnectionNone ${..args}"
|
|
|
75e927 |
+ none = "${snmptrap}::serverModuleConnectionNone ${args}"
|
|
|
75e927 |
}
|
|
|
75e927 |
|
|
|
75e927 |
# You can use the same opn / close / fail / none triggers for
|
|
|
75e927 |
--
|
|
|
75e927 |
2.1.1
|
|
|
75e927 |
|