Move module args to common section

diff --git a/raddb/trigger.conf b/raddb/trigger.conf
index 54746343946d0d4ec92b1e955466349b6cb2c322..f5b80830e1a0039f7ea8b1cd7cc61728f16e2f11 100644 (file)
--- a/raddb/trigger.conf
+++ b/raddb/trigger.conf
@@ -177,13 +177,13 @@ trigger {
        #  module.  You can have module-specific triggers, by placing a
        #  "trigger" subsection in the module configuration.
        modules {
+               # Common arguments
+               args = "radiusdModuleName s ldap' radiusdModuleInstance s ''"
+
                # The files module
                files {
-                       # Common arguments
-                       args = "radiusdModuleName s ldap' radiusdModuleInstance s ''"
-
                        # The module has been HUP'd via radmin
-                       hup = "${snmptrap}::serverModuleHup ${args}"
+                       hup = "${snmptrap}::serverModuleHup ${..args}"
 
                        # Note that "hup" can be used for every module
                        # which can be HUP'd via radmin
@@ -191,11 +191,8 @@ trigger {
 
                # The LDAP module
                ldap {
-                       # Common arguments
-                       args = "radiusdModuleName s ldap' radiusdModuleInstance s ''"
-
                        # Failed to open a new connection to the DB
-                       fail = "${snmptrap}::serverModuleConnectionFail ${args}"
+                       fail = "${snmptrap}::serverModuleConnectionFail ${..args}"
 
                        # There are no "open", "close", or "none" setting.
                        # This is because the LDAP module re-connects and closes
@@ -204,20 +201,17 @@ trigger {
 
                # The SQL module
                sql {
-                       # Common arguments
-                       args = "radiusdModuleName s 'sql' radiusdModuleInstance s ''"
-
                        # A new connection to the DB has been opened
-                       open = "${snmptrap}::serverModuleConnectionUp ${args}"
+                       open = "${snmptrap}::serverModuleConnectionUp ${..args}"
 
                        # A connection to the DB has been closed
-                       close = "${snmptrap}::serverModuleConnectionDown ${args}"
+                       close = "${snmptrap}::serverModuleConnectionDown ${..args}"
 
                        # Failed to open a new connection to the DB
-                       fail = "${snmptrap}::serverModuleConnectionFail ${args}"
+                       fail = "${snmptrap}::serverModuleConnectionFail ${..args}"
 
                        # There are no DB handles available.
-                       none = "${snmptrap}::serverModuleConnectionNone ${args}"
+                       none = "${snmptrap}::serverModuleConnectionNone ${..args}"
                }
        }
 }