Page MenuHomeDevCentral

No OneTemporary

diff --git a/pillar/salt/roles.sls b/pillar/salt/roles.sls
new file mode 100644
index 0000000..fa453ce
--- /dev/null
+++ b/pillar/salt/roles.sls
@@ -0,0 +1,15 @@
+roles:
+ eglide:
+ - shellserver
+ dwellers.nasqueron.org:
+ - paas-lxc
+ - paas-docker
+ ysul.nasqueron.org:
+ - devserver
+ - saltmaster
+ mail.nasqueron.org:
+ - mailserver
+ ns1.nasqueron.org:
+ - dns
+ ns2.nasqueron.org:
+ - dns
diff --git a/pillar/top.sls b/pillar/top.sls
index 0043045..9485ead 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,17 +1,18 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
base:
'*':
- core.hostnames
- certificates.certificates
+ - salt.roles
eglide:
- users.revokedusers
- users.shellusers
- users.shelladmins
- users.shellgroups
diff --git a/pillar/top.sls b/roles/core/salt/init.sls
similarity index 53%
copy from pillar/top.sls
copy to roles/core/salt/init.sls
index 0043045..1ebddea 100644
--- a/pillar/top.sls
+++ b/roles/core/salt/init.sls
@@ -1,17 +1,12 @@
# -------------------------------------------------------------
-# Salt configuration for Nasqueron servers
+# Salt — Salt configuration
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
-# Created: 2016-04-10
+# Created: 2017-06-12
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-base:
- '*':
- - core.hostnames
- - certificates.certificates
- eglide:
- - users.revokedusers
- - users.shellusers
- - users.shelladmins
- - users.shellgroups
+salt_roles:
+ grains.list_present:
+ - name: roles
+ - value: {{ pillar.get('roles')[grains['id']] }}
diff --git a/top.sls b/top.sls
index ed12a3e..97cc6ac 100644
--- a/top.sls
+++ b/top.sls
@@ -1,29 +1,30 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
base:
'*':
- roles/core/rc
- roles/core/hostname
- roles/core/network
- roles/core/motd
- roles/core/rsyslog
+ - roles/core/salt
- roles/core/sshd
- roles/core/letsencrypt
'local':
- roles/saltmaster/sudo
'dwellers.nasqueron.org':
- roles/paas-docker/docker
- roles/paas-lxc/lxc
'eglide':
- roles/shellserver/users
- roles/shellserver/userland-software
- roles/shellserver/eglide-website
- roles/shellserver/vhosts
- roles/shellserver/web-hosting
- roles/shellserver/odderon

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 7, 16:20 (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4252843
Default Alt Text
(3 KB)

Event Timeline