From ef7fbd0afdec41409e28a5a74dcf91f95c53a25c Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 24 Sep 2016 23:53:49 +0200
Subject: [PATCH] Use cmd with runas parameter

Replace the deprecated user and group parameters with runas to fix
deprecation warnings.
---
 states/gnuviechadmin/base.sls    | 6 ++----
 states/gnuviechadmin/django.sls  | 6 ++----
 states/gnuviechadmin/gvaldap.sls | 3 +--
 states/webserver/init.sls        | 3 +--
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/states/gnuviechadmin/base.sls b/states/gnuviechadmin/base.sls
index 8e22b87..ba80969 100644
--- a/states/gnuviechadmin/base.sls
+++ b/states/gnuviechadmin/base.sls
@@ -34,15 +34,13 @@ gnuviechadmin-packages:
 gnuviechadmin-venv:
   cmd.run:
     - name: virtualenv {{ venv }}
-    - user: vagrant
-    - group: vagrant
+    - runas: vagrant
     - unless: test -f {{ venv }}/bin/pip
 
 gnuviechadmin-requires:
   cmd.run:
     - name: {{ venv }}/bin/pip install -U -r requirements/local.txt && touch {{ venv }}/lastinstall
-    - user: vagrant
-    - group: vagrant
+    - runas: vagrant
     - cwd: {{ checkout }}
     - require:
       - cmd: gnuviechadmin-venv
diff --git a/states/gnuviechadmin/django.sls b/states/gnuviechadmin/django.sls
index 66125fc..6e57afd 100644
--- a/states/gnuviechadmin/django.sls
+++ b/states/gnuviechadmin/django.sls
@@ -3,8 +3,7 @@
 gnuviechadmin-dbschema:
   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
-    - user: vagrant
-    - group: vagrant
+    - runas: vagrant
     - cwd: {{ appdir }}
     - watch:
       - cmd: gnuviechadmin-requires
@@ -13,8 +12,7 @@ gnuviechadmin-dbschema:
 gnuviechadmin-locale-data-compile:
   cmd.wait:
     - name: . {{ home }}/gvasettings.sh ; {{ venv }}/bin/python {{ appdir }}/manage.py compilemessages
-    - user: vagrant
-    - group: vagrant
+    - runas: vagrant
     - cwd: {{ appdir }}
     - require:
       - pkg: gnuviechadmin-packages
diff --git a/states/gnuviechadmin/gvaldap.sls b/states/gnuviechadmin/gvaldap.sls
index 36906dc..3832763 100644
--- a/states/gnuviechadmin/gvaldap.sls
+++ b/states/gnuviechadmin/gvaldap.sls
@@ -15,6 +15,5 @@ base-ldap-objects:
   cmd.script:
     - source: salt://gnuviechadmin/gvaldap/create_base_ldap_objects.sh
     - template: jinja
-    - user: root
-    - group: root
+    - runas: 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
diff --git a/states/webserver/init.sls b/states/webserver/init.sls
index 59fad3b..5d287ae 100644
--- a/states/webserver/init.sls
+++ b/states/webserver/init.sls
@@ -18,8 +18,7 @@ generate-dhparam-nginx:
   cmd.run:
     - name: openssl dhparam -out {{ ssldir }}/dhparams.pem 2048
     - umask: 022
-    - user: root
-    - group: root
+    - runas: root
     - creates: {{ ssldir }}/dhparams.pem
     - require_in:
       - file: /etc/nginx/conf.d/ssl.conf