Move some of the gvaldap and gvaweb data to pillars

pillar/gnuviechadmin/gva.sls

@@ -0,0 +1,9 @@
+include:
+  - gnuviechadmin
+  - gnuviechadmin.queues.common
+
+gnuviechadmin:
+  appname: gva
+  gva:
+    django_secret_key: yBnbG4azhNaTxIW0/Rv2dEij9PcVU1KVR//1bR6LujmLBnZJw8OOrEi2dIqz3pyOdG8=
+

pillar/gnuviechadmin/gvaldap.sls

@@ -2,17 +2,22 @@ include:
   - gnuviechadmin
   - gnuviechadmin.queues.common
   - gnuviechadmin.queues.gvaldap
-  - ldapserver
 
 gnuviechadmin:
-  component:
-    name: gvaldap
-    amqp_user: ldap
-  ldap_admin_user: ldapadmin
-  ldap_admin_password: NnVnGoWBVw6BKb9DhTwHAz0ICrdiDy+HL1A6F2Rz
   allowed_hosts: 127.0.0.1,gvaldap.local,localhost
+  appname: gvaldap
+  server_email: gvaldap@gnuviech-server.de
+  admin_email: jan@dittberner.info
+  admin_name: Jan Dittberner
   gvaldap:
-    git_url: https://git.dittberner.info/gnuviech/gvaldap.git
-    git_branch: master
+    ldap_groups_ou: groups
+    ldap_users_ou: users
+    allowed_hosts: localhost,ldap
+    amqp_user: ldap
     celery_module: ldaptasks
     django_secret_key: IyOiTDt2DMo4gBVTwZ+E2p+mI1S/rNzZVIFlSr6TpgtxtsJODOVWHaxgVW3FqGZVaFU=
+    fullname: LDAP
+    git_branch: master
+    git_url: https://git.dittberner.info/gnuviech/gvaldap.git
+    ldap_admin_password: NnVnGoWBVw6BKb9DhTwHAz0ICrdiDy+HL1A6F2Rz
+    ldap_admin_user: ldapadmin

pillar/gnuviechadmin/gvaweb.sls

@@ -4,10 +4,10 @@ include:
   - gnuviechadmin.queues.gvaweb
 
 gnuviechadmin:
-  component:
-    name: gvaweb
-    amqp_user: web
+  appname: gvaweb
   gvaweb:
+    amqp_user: web
+    fullname: Web
     git_url: https://git.dittberner.info/gnuviech/gvaweb.git
     git_branch: master
     celery_module: webtasks

pillar/gnuviechadmin/init.sls

@@ -1,3 +1,6 @@
+include:
+  - gnuviechadmin.redis
+
 gnuviechadmin:
   ssh_known_hosts: |
       nextgit.gnuviech-server.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBESb6Q0nyvx82wJ0S6Jx7ZvY6wJzuwqh2zWOlXzLDcor8Pu5iLqUn5GywS0ooyl3Hkyn983R6Zdr49zgTroRwQA=
@@ -12,15 +15,12 @@ gnuviechadmin:
   osuserprefix: usr
   osuserhomedirbase: /home
   osuserdefaultshell: /usr/bin/rssh
-  uploadserver: gvafile.local
-  ldap_domain: gva.local
-  ldap_url: ldap://gvaldap.local
+  uploadserver: file
   ldap_base_dn: dc=gva,dc=local
-  ldap_groups_ou: groups
-  ldap_users_ou: users
-  redis_password: j2gfWeACPrj0R2xkgv4KAznCM9nCuUb4
-  redis_host: gva.local
-  django_secret_key: yBnbG4azhNaTxIW0/Rv2dEij9PcVU1KVR//1bR6LujmLBnZJw8OOrEi2dIqz3pyOdG8=
+  ldap_base_dn_groups: ou=groups,dc=gva,dc=local
+  ldap_base_dn_users: ou=groups,dc=gva,dc=local
+  ldap_domain: gva.local
+  ldap_url: ldap://ldap
   machines:
     gva.local:
       ip: 172.16.3.2

pillar/gnuviechadmin/redis.sls

@@ -0,0 +1,3 @@
+gnuviechadmin:
+  redis_password: j2gfWeACPrj0R2xkgv4KAznCM9nCuUb4
+  redis_host: mq

pillar/top.sls

@@ -1,12 +1,10 @@
 base:
-  '*':
-    - gnuviechadmin
-{% for role in ('database', 'queues', 'webinterface', 'gvaldap', 'gvafile', 'gvamysql', 'gvapgsql', 'gvaweb') %}
+{%- for role in ('database', 'redis', 'queues', 'gva', 'gvaldap', 'gvafile', 'gvamysql', 'gvapgsql', 'gvaweb') %}
   'roles:gnuviechadmin.{{ role }}':
     - match: grain
     - gnuviechadmin.{{ role }}
 {% endfor %}
-{% for role in ('fileserver', 'ldapclient') %}
+{% for role in ('fileserver', 'ldapserver', 'ldapclient') %}
   'roles:{{ role }}':
     - match: grain
     - {{ role }}