Synchronize salt configuration with gvaldap

pillar/gnuviechadmin/gvaldap.sls

@@ -1,4 +1,5 @@
 include:
+  - gnuviechadmin
   - gnuviechadmin.queues.common
   - gnuviechadmin.queues.gvaldap
 
@@ -6,3 +7,5 @@ gnuviechadmin:
   component:
     name: gvaldap
     amqp_user: ldap
+  ldap_admin_user: ldapadmin
+  allowed_hosts: 127.0.0.1,gvaldap.local,localhost

pillar/gnuviechadmin/init.sls

@@ -11,6 +11,8 @@ gnuviechadmin:
   osuserhomedirbase: /home
   osuserdefaultshell: /usr/bin/rssh
   uploadserver: gvafile.local
-  webmail_url: https://webmail.example.com/
-  phpmyadmin_url: https://phpmyadmin.example.com/
-  phppgadmin_url: https://phppgadmin.example.com/
+  ldap_domain: gva.local
+  ldap_url: ldap://gvaldap.local
+  ldap_base_dn: dc=gva,dc=local
+  ldap_groups_ou: groups
+  ldap_users_ou: users

pillar/gnuviechadmin/webinterface.sls

@@ -1,4 +1,5 @@
 include:
+  - gnuviechadmin
   - gnuviechadmin.queues.common
   - gnuviechadmin.queues.gva
 
@@ -7,3 +8,6 @@ gnuviechadmin:
     name: gva
     amqp_user: gva
     python_module: gnuviechadmin
+  webmail_url: https://webmail.example.com/
+  phpmyadmin_url: https://phpmyadmin.example.com/
+  phppgadmin_url: https://phppgadmin.example.com/