D2107.id5319.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2107.id5319.diff
View Options

	diff --git a/map.jinja b/map.jinja
	--- a/map.jinja
	+++ b/map.jinja
	@@ -119,6 +119,7 @@
	'librabbitmq': 'librabbitmq-dev',
	'lua': 'lua5.1',
	'mariadb': 'mariadb-server',
	+ 'netcat': 'nc',
	'node': 'nodejs',
	'pear': 'php-pear',
	'phpcs': 'php-codesniffer',
	@@ -144,6 +145,7 @@
	'librabbitmq': 'librabbitmq',
	'lua': 'lua',
	'mariadb': 'mariadb-server',
	+ 'netcat': 'nmap-netcat',
	'node': 'nodejs',
	'pear': 'php-pear',
	'phpcs': 'php-pear-PHP-CodeSniffer',
	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
	@@ -6,7 +6,7 @@
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	-{% from "map.jinja" import dirs with context %}
	+{% from "map.jinja" import dirs, packages with context %}

	# -------------------------------------------------------------
	# Software sources
	@@ -61,7 +61,7 @@
	- tree
	- wget
	{% if grains['os'] != 'FreeBSD' %}
	- - nc
	+ - {{ packages.netcat }}
	{% endif %}
	{% if grains['os_family'] == 'RedHat' %}
	- psmisc