From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 1 Sep 2025 08:48:10 +0000 (+0100)
Subject: Use Module-Name and Module-Instance in global triggers
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2488ce976b22ed1037614b8e67543729dcfda7a;p=thirdparty%2Ffreeradius-server.git

Use Module-Name and Module-Instance in global triggers
---

diff --git a/raddb/trigger.conf b/raddb/trigger.conf
index 4c89614f0c..cca0c820cd 100644
--- a/raddb/trigger.conf
+++ b/raddb/trigger.conf
@@ -172,9 +172,10 @@ trigger {
 	#  and these all support the following triggers relating to trunk
 	#  connection state changes.
 	#
-	#  Instead of globally configuring these triggers here, they should be configured per module instance
-	#  by including a `trigger` section within the module instance `pool` section.  That allows for
-	#  the `${.:name}` and `${.:instance}` expansions to reference the correct module name and instance name.
+	#  Instead of globally configuring these triggers here, they could be configured per module instance
+	#  by including a `trigger` section within the module instance `pool` section.  That allows for startup
+	#  expansions `${.:name}` and `${.:instance}` to reference the module name and instance name in place
+	#  of run-time expansions %{Module-Name} and %{Module-Instance}.
 	#
 	#  In addition to either enabling the triggers here or within the module `pool` section, for triggers
 	#  to be enabled for a specific module instance, the `triggers` option within the `pool` section needs
@@ -184,7 +185,7 @@ trigger {
 		#
 		#  Define common arguments to use below:
 		#
-#		args = "radiusdModuleName s '${.:name}' radiusdModuleInstance s '${.:instance}'"
+#		args = "radiusdModuleName s '%{Module-Name}' radiusdModuleInstance s '%{Module-Instance}'"
 
 		#
 		#  connection_halted:: A connection has entered the "halted" state.