Merge pull request #11804 from PhMemmel/turn-server-overlay-config

Config overlay for bbb-web turn server config

bigbluebutton-web/grails-app/conf/spring/resources.groovy

 // Place your Spring DSL code here
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+Logger logger = LoggerFactory.getLogger("org.bigbluebutton.web.services.turn.StunTurnService")
+
 beans = {
+  def turnConfigFilePath = "/etc/bigbluebutton/turn-stun-servers.xml"
+  def turnConfigFile = new File(turnConfigFilePath)
+  if (turnConfigFile.canRead()) {
+    logger.info("Reading stun/turn server config from overlay config file " + turnConfigFilePath)
+    importBeans('file:' + turnConfigFilePath)
+  } else {
+    logger.info("Overlay stun/turn server config file " + turnConfigFilePath
+      + " not found/readable, reading from default config file location")
+    importBeans('spring/turn-stun-servers.xml')
+  }
 }
+
 /*
 Add back applicationContext.xml
 
@@ -36,4 +52,4 @@ Add back applicationContext.xml
     <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean" />
 </beans>
 
-*/
\ No newline at end of file
+*/

bigbluebutton-web/grails-app/conf/spring/resources.xml

@@ -168,5 +168,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
     <import resource="doc-conversion.xml"/>
     <import resource="bbb-redis-messaging.xml"/>
-    <import resource="turn-stun-servers.xml"/>
+    <!-- moved the following import statement for turn-stun-servers.xml to resources.groovy to be able to use overlay config for turn/stun servers -->
+    <!--	 <import resource="turn-stun-servers.xml"/>-->
 </beans>