D1068.id2874.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1068.id2874.diff
View Options

	diff --git a/pillar/top.sls b/pillar/top.sls
	--- a/pillar/top.sls
	+++ b/pillar/top.sls
	@@ -17,5 +17,4 @@
	eglide:
	- users.revokedusers
	- users.shellusers
	- - users.shelladmins
	- users.shellgroups
	diff --git a/pillar/users/shelladmins.sls b/pillar/users/shelladmins.sls
	deleted file mode 100644
	--- a/pillar/users/shelladmins.sls
	+++ /dev/null
	@@ -1,15 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt — Admins accounts list
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Eglide
	-# Created: 2016-06-08
	-# License: Trivial work, not eligible to copyright
	-# -------------------------------------------------------------
	-
	-# -------------------------------------------------------------
	-# Admin accounts
	-# -------------------------------------------------------------
	-
	-shelladmins:
	- - dereckson
	- - sandlayth
	diff --git a/roles/shellserver/users/init.sls b/roles/shellserver/users/init.sls
	--- a/roles/shellserver/users/init.sls
	+++ b/roles/shellserver/users/init.sls
	@@ -63,22 +63,6 @@
	- gid: {{ args['gid'] }}
	- members: {{ args['members'] }}
	{% endfor %}
	-
	-{% if salt['group.info']('root') and salt['group.info']('root')['gid'] == 0 %}
	-rename_root_group_to_wheel:
	- cmd.run:
	- - name: sed -i 's/root:x:0:/wheel:x:0:/' /etc/group
	-{% endif %}
	-
	-wheel:
	- group.present:
	- - system: True
	- - gid: 0
	- - members:
	-{% for user in pillar.get('shelladmins') %}
	- - {{user}}
	-{% endfor %}
	-

	# -------------------------------------------------------------
	# Managed SSH keys