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
40 lines
1 KiB
Plaintext
40 lines
1 KiB
Plaintext
include:
|
|
- gnuviechadmin.base
|
|
- webserver
|
|
|
|
libpq-dev:
|
|
pkg.installed:
|
|
- require_in:
|
|
- pkg: gnuviechadmin-packages
|
|
|
|
python-m2crypto:
|
|
pkg.installed:
|
|
- reload_modules: true
|
|
|
|
{% import "webserver/sslcert.macros.sls" as sslcert %}
|
|
|
|
{% set domainname = salt['pillar.get']('gnuviechadmin:domainname') %}
|
|
{{ sslcert.key_cert(domainname) }}
|
|
|
|
/etc/nginx/sites-available/{{ domainname }}:
|
|
file.managed:
|
|
- user: root
|
|
- group: root
|
|
- mode: 0640
|
|
- source: salt://gnuviechadmin/gva/gnuviechadmin.nginx
|
|
- template: jinja
|
|
- context:
|
|
domainname: {{ domainname }}
|
|
ssl_keydir: {{ salt['pillar.get']('nginx:sslkeydir', '/etc/nginx/ssl/private') }}
|
|
ssl_certdir: {{ salt['pillar.get']('nginx:sslcertdir', '/etc/nginx/ssl/certs') }}
|
|
- require:
|
|
- pkg: nginx
|
|
|
|
/etc/nginx/sites-enabled/{{ domainname }}:
|
|
file.symlink:
|
|
- target: /etc/nginx/sites-available/{{ domainname }}
|
|
- require:
|
|
- file: /etc/nginx/sites-available/{{ domainname }}
|
|
- watch_in:
|
|
- service: nginx
|