diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml index afd5021..762c457 100644 --- a/dicos/99_one-frontend.xml +++ b/dicos/99_one-frontend.xml @@ -27,7 +27,7 @@ fr_FR - + @@ -36,8 +36,16 @@ adresse_ip_eth0 - ['ldap'] + ['', 'ldap'] + + + ldap + sunstone_auth_modes + distant + non + + non diff --git a/tmpl/sunstone-ldap_auth.conf b/tmpl/sunstone-ldap_auth.conf index 9929e54..2644da5 100644 --- a/tmpl/sunstone-ldap_auth.conf +++ b/tmpl/sunstone-ldap_auth.conf @@ -1,4 +1,4 @@ -%if 'ldap' in %%getVar('sunstone_auth_modes') +%if %%getVar('sunstone_auth_modes', None) == 'ldap' server 1: # Ldap user able to query, if not set connects as anonymous. For # Active Directory append the domain name. Example: diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf index cb2627e..c4002d7 100644 --- a/tmpl/sunstone-server.conf +++ b/tmpl/sunstone-server.conf @@ -65,7 +65,7 @@ # driver defined for the user # #:auth: sunstone -%if %%getVar('sunstone_auth_modes', []) == [] +%if %%getVar('sunstone_auth_modes', None) :auth: sunstone %else :auth: opennebula