Page MenuHomeDevCentral
Files F11724545

No OneTemporary
Actions

View Options

diff --git a/pillar/top.sls b/pillar/top.sls
index 3485510..e496233 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,11 +1,12 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
base:
eglide:
+ - users.revokedusers
- users.shellusers
diff --git a/pillar/users/shellusers.sls b/pillar/users/revokedusers.sls
similarity index 66%
copy from pillar/users/shellusers.sls
copy to pillar/users/revokedusers.sls
index e4e805d..b6abea1 100644
--- a/pillar/users/shellusers.sls
+++ b/pillar/users/revokedusers.sls
@@ -1,22 +1,15 @@
# -------------------------------------------------------------
-# Salt — Users accounts list
+# Salt — Revoked users accounts list
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
-# Created: 2016-04-08
+# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Users accounts
# -------------------------------------------------------------
-shellusers:
- tomjerr:
- fullname: Tommy Aditya
- uid: 2001
- fedai:
- fullname: Erol Unutmaz
- uid: 2002
- rashk0:
- fullname: Rashk0
- uid: 2003
+revokedusers:
+ # Account renamed to erol // T808
+ - fedai
diff --git a/pillar/users/shellusers.sls b/pillar/users/shellusers.sls
index e4e805d..57b986f 100644
--- a/pillar/users/shellusers.sls
+++ b/pillar/users/shellusers.sls
@@ -1,22 +1,22 @@
# -------------------------------------------------------------
# Salt — Users accounts list
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
# Created: 2016-04-08
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Users accounts
# -------------------------------------------------------------
shellusers:
tomjerr:
fullname: Tommy Aditya
uid: 2001
- fedai:
+ erol:
fullname: Erol Unutmaz
uid: 2002
rashk0:
fullname: Rashk0
uid: 2003
diff --git a/roles/shellserver/users/files/ssh_keys/erol b/roles/shellserver/users/files/ssh_keys/erol
new file mode 100644
index 0000000..763adc2
--- /dev/null
+++ b/roles/shellserver/users/files/ssh_keys/erol
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDdHrSRJGwaGFTpoZIvkoWTMpnXgke77emVicMT8b37kcUepeD91pA3UPQ7UOEQl/Af3Ly7ePneymZ6NjAkM06oPeIjxE6Nz+i6p7rVIZhCb9qz+hdKgt4wSEQLWponegFNdCUs6HvMjDGlsI0kajHgIakXiKAwNyxhQzpBoGranO9c2PdAq2HGq7Kcq8ApC1kdKG0W3dT4PWborzmt1jWna2yosEn+TTHj5wi2p/E9BsCbmfokBO3xn491lr1P4shh4zg7Mv3SPD3j4/mZb9EMwD8cl4y9ZIoMEbL8p4s8J7Joqs3gK9hmMN5ZCNUFrNrJu3TCRZre2k7cV3+U3IXT erol@fedai
diff --git a/roles/shellserver/users/files/ssh_keys/fedai b/roles/shellserver/users/files/ssh_keys/fedai
deleted file mode 100644
index 2a22b32..0000000
--- a/roles/shellserver/users/files/ssh_keys/fedai
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAnH+wU01809/OZseFQsfwUL6qLOgi7JL/aMvQB3AZGS7RNLt2ESPbQmWswREByDe/XVO+9IZ5x3SbVyPcP3WEqD4YgT5P/4lK9OTJCPkHClTFMccspzH37B3ccueerww8Mwim3F2VwGFDdzg71FhQT95Yg0vrhyzHXuN2Z
diff --git a/roles/shellserver/users/init.sls b/roles/shellserver/users/init.sls
index c75cc1e..038a4d7 100644
--- a/roles/shellserver/users/init.sls
+++ b/roles/shellserver/users/init.sls
@@ -1,69 +1,66 @@
# -------------------------------------------------------------
# Salt — Provision users accounts
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
# Created: 2016-04-08
# Description: Adds and revokes user accounts, in the relevant
# groups and with their stable SSH keys.
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Table of contents
# -------------------------------------------------------------
#
# :: Disabled accounts
#  :: Active accounts
#  :: Groups
# :: Managed SSH keys
#
# -------------------------------------------------------------
# -------------------------------------------------------------
# Disabled accounts
# -------------------------------------------------------------
-# Currently, there is no revoked accounts on Eglide.
-#
-# To disable an account, remove it from the active section and
-# add here the following block:
-#
-# orkaevash:
-# user.absent
+{% for user in pillar.get('revokedusers') %}
+{{user}}:
+ user.absent
+{% endfor %}
# -------------------------------------------------------------
# Active accounts
# -------------------------------------------------------------
{% for user, args in pillar.get('shellusers', {}).iteritems() %}
{{user}}:
user.present:
- fullname: {{ args['fullname'] }}
- shell: /bin/bash
- uid: {{ args['uid'] }}
{% endfor %}
# -------------------------------------------------------------
# Groups
# -------------------------------------------------------------
shell:
group.present:
- system: True
- gid: 200
- members:
{% for user, args in pillar.get('shellusers', {}).iteritems() %}
- {{user}}
{% endfor %}
# -------------------------------------------------------------
# Managed SSH keys
# -------------------------------------------------------------
{% for user, args in pillar.get('shellusers', {}).iteritems() %}
sshkey_{{user}}:
ssh_auth.present:
- user: {{user}}
- source: salt://roles/shellserver/users/files/ssh_keys/{{user}}
{% endfor %}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Sep 18, 15:55 (2 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2991053
Default Alt Text
(6 KB)

Event Timeline

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