From d1d4d00ab20581cf912da7ecb61e8333558a5d1d Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Mar 14 2019 16:11:14 +0000
Subject: Merge branch 'cboltz-osem-sudo' into 'production'


fix osem sudo config and allow osem-admins group

See merge request infra/salt!235
---

diff --git a/pillar/role/web_osem.sls b/pillar/role/web_osem.sls
index 343dd9f..6c31891 100644
--- a/pillar/role/web_osem.sls
+++ b/pillar/role/web_osem.sls
@@ -1,8 +1,10 @@
 sudoers:
   included_files:
-    /etc/sudoers.d/group_osem:
+    /etc/sudoers.d/osem:
+      groups:
+        osem-admins:
+          - 'ALL=(ALL) ALL'
       users:
         osem:
-          - ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart osem-dj
-          - ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart osem
-
+          - 'ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart osem-dj'
+          - 'ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart osem'