Jan Dittberner
6147a90066
This commit improves the salt setup of the Vagrant box: - Salt output is reduced to log level warning - Hosts entries are created for the internal IPs of all planned gva component VMs - .bashrc and a .bash_functions sourced from it are now managed for the vagrant user - the VM name has been changed to gva.local - recent salt versions do not depend on m2crypto anymore, therefore it is now installed before x509certificate functions are called - the rabbitmq_vhost for gva is now setup before any users are created because the previous implementation was broken with recent salt versions - the gnuviechadmin-locale-data-compile step has been simplified because Django 1.9's compilemessages takes care of recursive .mo file compilation - pillar data has been separated by role (especially queue permissions and credentials) - salt configuration is now unified with gvaldap
34 lines
1.2 KiB
Plaintext
34 lines
1.2 KiB
Plaintext
include:
|
|
- postgresql-server
|
|
|
|
gnuviechadmin-database:
|
|
postgres_user.present:
|
|
- name: {{ salt['pillar.get']('gnuviechadmin:database:owner:user') }}
|
|
- user: postgres
|
|
- password: {{ salt['pillar.get']('gnuviechadmin:database:owner:password') }}
|
|
- login: True
|
|
- createdb: {% if salt['pillar.get']('gnuviechadmin:deploymenttype', 'production') == 'local' %}True
|
|
{%- else %}False
|
|
{%- endif %}
|
|
- require:
|
|
- service: postgresql
|
|
postgres_database.present:
|
|
- name: {{ salt['pillar.get']('gnuviechadmin:database:name') }}
|
|
- user: postgres
|
|
- owner: {{ salt['pillar.get']('gnuviechadmin:database:owner:user') }}
|
|
- encoding: UTF8
|
|
- template: template0
|
|
- require:
|
|
- service: postgresql
|
|
- postgres_user: {{ salt['pillar.get']('gnuviechadmin:database:owner:user') }}
|
|
|
|
{% for gnuviechadmin_db_role in salt['pillar.get']('gnuviechadmin:database:users') %}
|
|
gnuviechadmin-dbuser-{{ gnuviechadmin_db_role }}:
|
|
postgres_user.present:
|
|
- name: {{ salt['pillar.get']('gnuviechadmin:database:users:%s:user' % gnuviechadmin_db_role) }}
|
|
- password: {{ salt['pillar.get']('gnuviechadmin:database:users:%s:password' % gnuviechadmin_db_role) }}
|
|
- login: True
|
|
- require:
|
|
- service: postgresql
|
|
{% endfor %}
|