Jan Dittberner
8396a0788d
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
38 lines
763 B
Text
38 lines
763 B
Text
nginx:
|
|
pkg:
|
|
- installed
|
|
service.running:
|
|
- enable: True
|
|
- require:
|
|
- pkg: nginx
|
|
|
|
nginx-common:
|
|
pkg.installed
|
|
|
|
/etc/nginx/nginx.conf:
|
|
file.managed:
|
|
- source: salt://nginx/nginx.conf
|
|
- user: root
|
|
- group: root
|
|
- mode: 0644
|
|
- require:
|
|
- pkg: nginx-common
|
|
- watch_in:
|
|
- service: nginx
|
|
|
|
{% set nginx_ssl_keydir = salt['pillar.get']('nginx:sslkeydir', '/etc/nginx/ssl/private') %}
|
|
{% set nginx_ssl_certdir = salt['pillar.get']('nginx:sslcertdir', '/etc/nginx/ssl/certs') %}
|
|
|
|
{{ nginx_ssl_certdir }}:
|
|
file.directory:
|
|
- user: root
|
|
- group: root
|
|
- mode: 0755
|
|
- makedirs: True
|
|
|
|
{{ nginx_ssl_keydir }}:
|
|
file.directory:
|
|
- user: root
|
|
- group: root
|
|
- mode: 0750
|
|
- makedirs: True
|