Merge branch 'develop' into dist/eole/2.7.1/develop
This commit is contained in:
commit
589ededb9c
@ -49,7 +49,13 @@
|
||||
<value>Default</value>
|
||||
</variable>
|
||||
<variable name="accLimitTarget" type="string" description="Restriction d'accès à ces IP/noms d'hôtes (liste séparateur séparateur ',')" />
|
||||
|
||||
<variable name="create_db" type='oui/non' description="Créer des bases de données">
|
||||
<value>non</value>
|
||||
</variable>
|
||||
</family>
|
||||
<family name="MariaDB Databases">
|
||||
<variable name="db_name" type='string' description='Nom de la base de donnée' multi="True"/>
|
||||
<variable name="db_admin_user" type='string' description="Nom de l'utilisateur gestionnaire de la base de données"/>
|
||||
</family>
|
||||
|
||||
<!-- Tunning -->
|
||||
@ -135,10 +141,11 @@
|
||||
</family>
|
||||
<separators>
|
||||
<separator name='dbCreateFixAdmin'>Comptes d'administration supplémentaires</separator>
|
||||
<separator name='create_db'>Ajouter des bases de données</separator>
|
||||
</separators>
|
||||
</variables>
|
||||
<constraints>
|
||||
<check name="valid_ipnetmask" target="maskMariaDBLimit" level="warning">
|
||||
<check name="valid_ipnetmask" target="maskMariaDBLimit" level="warning">
|
||||
<param type='eole'>ipMariaDBLimit</param>
|
||||
</check>
|
||||
|
||||
@ -167,6 +174,10 @@
|
||||
<slave>ifMariaDBLimit</slave>
|
||||
</group>
|
||||
|
||||
<group master='db_name'>
|
||||
<slave>db_admin_user</slave>
|
||||
</group>
|
||||
|
||||
<fill name='calc_multi_condition' target='accLimitTarget'>
|
||||
<param>Default</param>
|
||||
<param type='eole' name='condition_1'>accLimits</param>
|
||||
@ -185,6 +196,11 @@
|
||||
<target type='servicelist'>bdd</target>
|
||||
</condition>
|
||||
|
||||
<condition name='disabled_if_in' source='create_db'>
|
||||
<param>non</param>
|
||||
<target type='family'>MariaDB Databases</target>
|
||||
</condition>
|
||||
|
||||
<condition name='disabled_if_in' source="dbCreateFixAdmin">
|
||||
<param>non</param>
|
||||
<target type='variable'>accName</target>
|
||||
|
Loading…
Reference in New Issue
Block a user