Page MenuHomeDevCentral
Files F3768944

D1379.diff
No OneTemporary
Actions

D1379.diff
View Options

diff --git a/roles/core/init.sls b/roles/core/init.sls
--- a/roles/core/init.sls
+++ b/roles/core/init.sls
@@ -16,4 +16,5 @@
- .sudo
- .sysctl
- .timezone
+ - .userland-software
- .users
diff --git a/roles/core/userland-software/init.sls b/roles/core/userland-software/init.sls
new file mode 100644
--- /dev/null
+++ b/roles/core/userland-software/init.sls
@@ -0,0 +1,30 @@
+# -------------------------------------------------------------
+# Salt — Provision software needed by other core roles
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2016-04-09
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% from "map.jinja" import dirs with context %}
+
+# -------------------------------------------------------------
+# Shells
+# -------------------------------------------------------------
+
+shells:
+ pkg:
+ - installed
+ - pkgs:
+ - bash
+ - fish
+ - zsh
+ {% if grains['os'] != 'FreeBSD' %}
+ - tcsh
+ {% endif %}
+
+{{ dirs.share }}/zsh/site-functions/_pm:
+ file.managed:
+ # At commit 683d331 - 2017-11-05
+ - source: https://raw.githubusercontent.com/Angelmmiguel/pm/master/zsh/_pm
+ - source_hash: deea33968be713cdbd8385d3a72df2dd09c444e42499531893133f009f0ce0ea
diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -9,27 +9,6 @@
{% from "map.jinja" import dirs, packages, packages_prefixes with context %}
# -------------------------------------------------------------
-# Shells
-# -------------------------------------------------------------
-
-shells:
- pkg:
- - installed
- - pkgs:
- - bash
- - fish
- - zsh
- {% if grains['os'] != 'FreeBSD' %}
- - tcsh
- {% endif %}
-
-/usr/local/share/zsh/site-functions/_pm:
- file.managed:
- # At commit 683d331 - 2017-11-05
- - source: https://raw.githubusercontent.com/Angelmmiguel/pm/master/zsh/_pm
- - source_hash: deea33968be713cdbd8385d3a72df2dd09c444e42499531893133f009f0ce0ea
-
-# -------------------------------------------------------------
# Editors
#
# Disclaimer: We don't caution the views of Richard Stallman

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 11:32 (13 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2260094
Default Alt Text
D1379.diff (2 KB)

Event Timeline

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