Implement salt states for gva webinterface

- setup listener and pg_hba.conf for PostgreSQL server
- add state code for gva
- add macros for nginx and uwsgi with Python 3 support
- add pillar data for gva

pillar/gnuviechadmin/gva.sls

@@ -1,9 +1,18 @@
 include:
   - gnuviechadmin
+  - gnuviechadmin.database
   - gnuviechadmin.queues.common
+  - gnuviechadmin.queues.gva
 
 gnuviechadmin:
   appname: gva
+  database:
+    host: pgsql
   gva:
+    fullname: Self Service Web Interface
     django_secret_key: yBnbG4azhNaTxIW0/Rv2dEij9PcVU1KVR//1bR6LujmLBnZJw8OOrEi2dIqz3pyOdG8=
-
+    git_url: https://git.dittberner.info/gnuviech/gva.git
+    git_branch: master
+    url_webmail: https://webmail.gva.local/
+    url_mysql_admin: https://phpmyadmin.gva.local/
+    url_pgsql_admin: https://phppgadmin.gva.local/

pillar/gnuviechadmin/init.sls

@@ -6,6 +6,7 @@ gnuviechadmin:
       nextgit.gnuviech-server.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBESb6Q0nyvx82wJ0S6Jx7ZvY6wJzuwqh2zWOlXzLDcor8Pu5iLqUn5GywS0ooyl3Hkyn983R6Zdr49zgTroRwQA=
   deploymenttype: local
   mailfrom: admin@gnuviech-server.de
+  adminname: Gnuviech Admin
   adminemail: admin@gnuviech-server.de
   sitename: Gnuviech Customer Self Service
   domainname: localhost
@@ -21,18 +22,43 @@ gnuviechadmin:
   ldap_domain: gva.local
   ldap_url: ldap://ldap
   machines:
-    gva.local:
-      ip: 172.16.3.2
+    salt:
+      ip: 172.16.4.10
+    mq:
+      ip: 172.16.4.20
+    syslog:
+      ip: 172.16.4.30
+    pgsql:
+      ip: 172.16.4.40
       names:
-        - mq
-        - gva.local
-    gvaldap.local:
-      ip: 172.16.3.3
-    gvafile.local:
-      ip: 172.16.3.4
-    gvaweb.local:
-      ip: 172.16.3.5
-    gvamysql.local:
-      ip: 172.16.3.6
-    gvapgsql.local:
-      ip: 172.16.3.7
+        - pgsql
+        - gvapgsql
+    dns:
+      ip: 172.16.4.50
+    ldap:
+      ip: 172.16.4.60
+      names:
+        - ldap
+        - gvaldap
+    file:
+      ip: 172.16.4.70
+      names:
+        - file
+        - gvafile
+    mail:
+      ip: 172.16.4.80
+    mysql:
+      ip: 172.16.4.90
+      names:
+        - mysql
+        - gvamysql
+    web:
+      ip: 172.16.4.100
+      names:
+        - web
+        - gvaweb
+    service:
+      ip: 172.16.4.110
+      names:
+        - service
+        - gva

pillar/postgresql-server/init.sls

@@ -0,0 +1,6 @@
+postgresql-server:
+  local-net: 172.16.4.0/24
+  shared_buffers: 128MB
+  work_mem: 5MB
+  maintenance_work_mem: 4MB
+  effective_cache_size: 128MB

pillar/top.sls

@@ -7,7 +7,7 @@ base:
     - match: grain
     - gnuviechadmin.{{ role }}
 {% endfor %}
-{% for role in ('fileserver', 'ldapserver', 'ldapclient') %}
+{% for role in ('fileserver', 'ldapserver', 'ldapclient', 'postgresql-server', 'webserver') %}
   'roles:{{ role }}':
     - match: grain
     - {{ role }}

pillar/webserver/init.sls

@@ -0,0 +1 @@
+