Page MenuHomeDevCentral
Files F3774207

D995.diff
No OneTemporary
Actions

D995.diff
View Options

diff --git a/pillar/salt/roles.sls b/pillar/salt/roles.sls
new file mode 100644
--- /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
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -10,6 +10,7 @@
'*':
- core.hostnames
- certificates.certificates
+ - salt.roles
eglide:
- users.revokedusers
- users.shellusers
diff --git a/pillar/top.sls b/roles/core/salt/init.sls
copy from pillar/top.sls
copy to roles/core/salt/init.sls
--- 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
--- a/top.sls
+++ b/top.sls
@@ -13,6 +13,7 @@
- roles/core/network
- roles/core/motd
- roles/core/rsyslog
+ - roles/core/salt
- roles/core/sshd
- roles/core/letsencrypt
'local':

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 10:31 (20 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2262372
Default Alt Text
D995.diff (1 KB)

Event Timeline

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