Page MenuHomeDevCentral
Files F3917121

D398.diff
No OneTemporary
Actions

D398.diff
View Options

diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -10,3 +10,4 @@
eglide:
- users.revokedusers
- users.shellusers
+ - users.shelladmins
diff --git a/pillar/users/shellusers.sls b/pillar/users/shelladmins.sls
copy from pillar/users/shellusers.sls
copy to pillar/users/shelladmins.sls
--- a/pillar/users/shellusers.sls
+++ b/pillar/users/shelladmins.sls
@@ -1,22 +1,15 @@
# -------------------------------------------------------------
-# Salt — Users accounts list
+# Salt — Admins accounts list
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
-# Created: 2016-04-08
+# Created: 2016-06-08
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
-# Users accounts
+# Admin accounts
# -------------------------------------------------------------
-shellusers:
- tomjerr:
- fullname: Tommy Aditya
- uid: 2001
- erol:
- fullname: Erol Unutmaz
- uid: 2002
- rashk0:
- fullname: Rashk0
- uid: 2003
+shelladmins:
+ - dereckson
+ - kalix
diff --git a/pillar/users/shellusers.sls b/pillar/users/shellusers.sls
--- a/pillar/users/shellusers.sls
+++ b/pillar/users/shellusers.sls
@@ -20,3 +20,9 @@
rashk0:
fullname: Rashk0
uid: 2003
+ dereckson:
+ fullname: Sebastien Santoro
+ uid: 5001
+ kalix:
+ fullname: Yassine Hadj Messaoud
+ uid: 5002
diff --git a/roles/shellserver/users/files/ssh_keys/dereckson b/roles/shellserver/users/files/ssh_keys/dereckson
new file mode 100644
--- /dev/null
+++ b/roles/shellserver/users/files/ssh_keys/dereckson
@@ -0,0 +1,2 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMKBin4bpJpIkWVVjmYbivtNmWo3KgBLmx0/KXaw8QUl dereckson@ysul.nasqueron.org
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLfobLEaqFGcg3FA3DPDmKYnvNd6LNAJZfSKjRzUv9LxTbx+oaVc0qr2dhbBrMeW2U5HA9fy0/6EHeeQbxtCBHE= dereckson@tempus
diff --git a/roles/shellserver/users/files/ssh_keys/kalix b/roles/shellserver/users/files/ssh_keys/kalix
new file mode 100644
--- /dev/null
+++ b/roles/shellserver/users/files/ssh_keys/kalix
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL4H4SF3NZ0/o5uTYhIUKUEzP7hlZ0mGqMxs6wt/dhQs kalix@arch-laptop
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
@@ -52,6 +52,22 @@
{% for user, args in pillar.get('shellusers', {}).iteritems() %}
- {{user}}
{% 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
diff --git a/top.sls b/top.sls
--- a/top.sls
+++ b/top.sls
@@ -8,5 +8,5 @@
base:
'eglide':
- - roles/shellserver/userland-software
- roles/shellserver/users
+ - roles/shellserver/userland-software

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 02:58 (17 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2307631
Default Alt Text
D398.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator