gnuviech/gvasalt
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use cmd with runas parameter

Browse source 
Replace the deprecated user and group parameters with runas to fix
deprecation warnings.
This commit is contained in:
Jan Dittberner 2016-09-24 23:53:49 +02:00
parent 95b2e521eb
commit ef7fbd0afd
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
states/gnuviechadmin/base.sls
View file

@ -34,15 +34,13 @@ gnuviechadmin-packages:
gnuviechadmin-venv: gnuviechadmin-venv:
cmd.run: cmd.run:
- name: virtualenv {{ venv }} - name: virtualenv {{ venv }}
- user: vagrant - runas: vagrant
- group: vagrant
- unless: test -f {{ venv }}/bin/pip - unless: test -f {{ venv }}/bin/pip
gnuviechadmin-requires: gnuviechadmin-requires:
cmd.run: cmd.run:
- name: {{ venv }}/bin/pip install -U -r requirements/local.txt && touch {{ venv }}/lastinstall - name: {{ venv }}/bin/pip install -U -r requirements/local.txt && touch {{ venv }}/lastinstall
- user: vagrant - runas: vagrant
- group: vagrant
- cwd: {{ checkout }} - cwd: {{ checkout }}
- require: - require:
- cmd: gnuviechadmin-venv - cmd: gnuviechadmin-venv

6
states/gnuviechadmin/django.sls
View file

@ -3,8 +3,7 @@
gnuviechadmin-dbschema: gnuviechadmin-dbschema:
cmd.wait: cmd.wait:
- name: . {{ home }}/gvasettings.sh ; unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME ; {{ venv }}/bin/python manage.py migrate --noinput - name: . {{ home }}/gvasettings.sh ; unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME ; {{ venv }}/bin/python manage.py migrate --noinput
- user: vagrant - runas: vagrant
- group: vagrant
- cwd: {{ appdir }} - cwd: {{ appdir }}
- watch: - watch:
- cmd: gnuviechadmin-requires - cmd: gnuviechadmin-requires
@ -13,8 +12,7 @@ gnuviechadmin-dbschema:
gnuviechadmin-locale-data-compile: gnuviechadmin-locale-data-compile:
cmd.wait: cmd.wait:
- name: . {{ home }}/gvasettings.sh ; {{ venv }}/bin/python {{ appdir }}/manage.py compilemessages - name: . {{ home }}/gvasettings.sh ; {{ venv }}/bin/python {{ appdir }}/manage.py compilemessages
- user: vagrant - runas: vagrant
- group: vagrant
- cwd: {{ appdir }} - cwd: {{ appdir }}
- require: - require:
- pkg: gnuviechadmin-packages - pkg: gnuviechadmin-packages

3
states/gnuviechadmin/gvaldap.sls
View file

@ -15,6 +15,5 @@ base-ldap-objects:
cmd.script: cmd.script:
- source: salt://gnuviechadmin/gvaldap/create_base_ldap_objects.sh - source: salt://gnuviechadmin/gvaldap/create_base_ldap_objects.sh
- template: jinja - template: jinja
- user: root - runas: root
- group: root
- unless: ldapsearch -Y EXTERNAL -H ldapi:// -b "{{ salt['pillar.get']('gnuviechadmin:ldap_base_dn') }}" "cn={{ salt['pillar.get']('gnuviechadmin:ldap_admin_user') }}" | grep -q numEntries - unless: ldapsearch -Y EXTERNAL -H ldapi:// -b "{{ salt['pillar.get']('gnuviechadmin:ldap_base_dn') }}" "cn={{ salt['pillar.get']('gnuviechadmin:ldap_admin_user') }}" | grep -q numEntries

3
states/webserver/init.sls
View file

@ -18,8 +18,7 @@ generate-dhparam-nginx:
cmd.run: cmd.run:
- name: openssl dhparam -out {{ ssldir }}/dhparams.pem 2048 - name: openssl dhparam -out {{ ssldir }}/dhparams.pem 2048
- umask: 022 - umask: 022
- user: root - runas: root
- group: root
- creates: {{ ssldir }}/dhparams.pem - creates: {{ ssldir }}/dhparams.pem
- require_in: - require_in:
- file: /etc/nginx/conf.d/ssl.conf - file: /etc/nginx/conf.d/ssl.conf