prise en compte du port de l'ead configuré dans genconfig (fixes #32749)
This commit is contained in:
parent
27bcb3fbe7
commit
295c4bd4f7
|
@ -76,7 +76,7 @@
|
||||||
<variable name='ninegate_test_sonde' type='oui/non' hidden='True'/>
|
<variable name='ninegate_test_sonde' type='oui/non' hidden='True'/>
|
||||||
<variable name='ninegate_test_conf_cadolesldap' type='oui/non' hidden='True'/>
|
<variable name='ninegate_test_conf_cadolesldap' type='oui/non' hidden='True'/>
|
||||||
<variable name='ninegate_test_conf_ldap' type='oui/non' hidden='True'/>
|
<variable name='ninegate_test_conf_ldap' type='oui/non' hidden='True'/>
|
||||||
|
<variable name="ninegate_widead_port" type='port' description="Port d'accès EAD personnalisé" hidden='True'><value>4200</value></variable>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -925,10 +925,20 @@
|
||||||
<target type='variable'>ninegate_widead_url</target>
|
<target type='variable'>ninegate_widead_url</target>
|
||||||
</condition>
|
</condition>
|
||||||
|
|
||||||
|
<fill name='calc_multi_condition' target='ninegate_widead_port'>
|
||||||
|
<param>oui</param>
|
||||||
|
<param type='eole' name='condition_1' hidden='False'>activer_ead_reverseproxy</param>
|
||||||
|
<param type='eole' name='match' hidden='False'>port_ead_reverseproxy</param>
|
||||||
|
<param name='mismatch'>4200</param>
|
||||||
|
<param name='default_match'>4200</param>
|
||||||
|
</fill>
|
||||||
|
|
||||||
<fill name='concat' target='ninegate_widead_url'>
|
<fill name='concat' target='ninegate_widead_url'>
|
||||||
<param>https://</param>
|
<param>https://</param>
|
||||||
<param type='eole'>web_url</param>
|
<param type='eole'>web_url</param>
|
||||||
<param>:4200</param>
|
<param>:</param>
|
||||||
|
<param type='eole'>ninegate_widead_port</param>
|
||||||
|
<param>/connect/?server=1</param>
|
||||||
</fill>
|
</fill>
|
||||||
|
|
||||||
<!-- AFFICHAGE EN FONCTION DU WIDGET EOE -->
|
<!-- AFFICHAGE EN FONCTION DU WIDGET EOE -->
|
||||||
|
|
Loading…
Reference in New Issue