D3052.id7787.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3052.id7787.diff
View Options

	diff --git a/roles/core/userland-software/init.sls b/roles/core/userland-software/init.sls
	--- a/roles/core/userland-software/init.sls
	+++ b/roles/core/userland-software/init.sls
	@@ -171,3 +171,17 @@
	- source: salt://roles/core/userland-software/files/new-partition.sh
	- mode: 755
	{% endif %}
	+
	+# -------------------------------------------------------------
	+# Nano configuration
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+
	+nano_sls_support:
	+ file.replace:
	+ - name: {{ dirs.share }}/nano/yaml.nanorc
	+ - pattern: {{ 'syntax yaml "\.ya?ml$"' \| regex_escape }}
	+ - repl: syntax yaml "\.(ya?ml\|sls)$"
	+
	+{{ dirs.etc }}/nanorc:
	+ nano.config_autogenerated:
	+ - nanorc_dir: {{ dirs.share }}/nano
	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
	@@ -23,7 +23,6 @@
	pkg.installed:
	- pkgs:
	- joe
	- - nano
	- vim
	- emacs-nox

	@@ -285,17 +284,3 @@
	- gcal
	- pdftk
	- qpdf
	-
	-# -------------------------------------------------------------
	-# Nano configuration
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-
	-nano_sls_support:
	- file.replace:
	- - name: {{ dirs.share }}/nano/yaml.nanorc
	- - pattern: {{ 'syntax yaml "\.ya?ml$"' \| regex_escape }}
	- - repl: syntax yaml "\.(ya?ml\|sls)$"
	-
	-{{ dirs.etc }}/nanorc:
	- nano.config_autogenerated:
	- - nanorc_dir: {{ dirs.share }}/nano