modif exercices

This commit is contained in:
2015-03-09 09:35:21 +01:00
parent a0893bdafe
commit 89a2a3604a
6 changed files with 40 additions and 61 deletions

View File

@ -1,37 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<creole>
<containers>
<container name="web">
<file name='/etc/phpldapadmin/apache.conf'/>
<file name='/etc/phpldapadmin/config.php' source='phpldapadmin.php' filelist='phpldapadmin'/>
<container name="web">
<file name='/etc/phpldapadmin/apache.conf'/>
<file name='/etc/phpldapadmin/config.php' source='phpldapadmin.php' filelist='phpldapadmin'/>
<package>phpldapadmin</package>
</container>
</container>
</containers>
<variables>
<family name='services'>
<variable name='activate_phpldapadmin' type='string' description="Activer phpldapadmin">
<value>non</value>
</variable>
</family>
<family name='phpldapadmin' hidden='True'>
<variable name="phpldapadmin_host" type="string" description="Adresse IP ou DNS du serveur ldap" multi='True'/>
<variable name="phpldapadmin_name" type="string" description="Nom du serveur ldap"/>
<variable name="phpldapadmin_tls" type="string" description="Connexion TLS">
<value>non</value>
<family name='applications web'>
<variable name='activate_phpldapadmin' type='oui/non' description="Activer phpldapadmin">
<value>non</value>
</variable>
</family>
<family name='phpldapadmin'>
<variable name="phpldapadmin_host" type="string" description="Adresse IP ou DNS du serveur ldap" multi='True' mandatory="True">
<value>localhost</value>
</variable>
<variable name="phpldapadmin_name" type="string" description="Nom du serveur ldap" mandatory="True"/>
</family>
</variables>
<constraints>
<check name='valid_enum' target='activate_phpldapadmin'>
<param>['oui','non']</param>
</check>
<check name='valid_enum' target='phpldapadmin_tls'>
<param>['oui','non']</param>
</check>
<check name='obligatoire' target='phpldapadmin_host'/>
<check name='obligatoire' target='phpldapadmin_name'/>
<check name='obligatoire' target='phpldapadmin_tls'/>
<condition name='hidden_if_in' source='activate_phpldapadmin'>
<param>non</param>
<target type='family'>phpldapadmin</target>
@ -39,7 +29,6 @@
</condition>
<group master='phpldapadmin_host'>
<slave>phpldapadmin_name</slave>
<slave>phpldapadmin_tls</slave>
</group>
</constraints>
<help>

View File

@ -1,24 +1,17 @@
...
/*********************************************/
/* Define your LDAP servers in this section */
/*********************************************/
$ldapservers = new LDAPServers;
%set %%i = 0
%for %%phpldapadmin in %%phpldapadmin_host
$i=%%i;
$ldapservers->SetValue($i,'server','name','%%phpldapadmin_name');
%if %%phpldapadmin.phpldapadmin_tls == 'oui':
$ldapservers->SetValue($i,'server','host','ldaps://%%phpldapadmin');
%if %%phpldapadmin.phpldapadmin_name == ""
$ldapservers->SetValue(0,'server','name','Serveur LDAP');
%else
$ldapservers->SetValue($i,'server','host','ldap://%%phpldapadmin');
$ldapservers->SetValue(0,'server','name','%%phpldapadmin.phpldapadmin_name');
%end if
%if %%phpldapadmin.phpldapadmin_tls == 'oui':
$ldapservers->SetValue($i,'server','tls',true);
%else
$ldapservers->SetValue($i,'server','tls',false);
%end if
$ldapservers->SetValue(0,'server','host','ldap://%%phpldapadmin');
%set %%i = %%i + 1
$ldapservers->SetValue(0,'server','tls',false);
%end for
...