D2468.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2468.diff
View Options

	diff --git a/pillar/devserver/ports.sls b/pillar/devserver/ports.sls
	--- a/pillar/devserver/ports.sls
	+++ b/pillar/devserver/ports.sls
	@@ -23,6 +23,7 @@
	- THREADS
	- GTK2
	- "X11"
	+
	ffmpeg:
	category: multimedia
	name: ffmpeg
	@@ -123,3 +124,20 @@
	- LIBRTMP
	- MBEDTLS
	- OPENSSL
	+
	+ node:
	+ category: www
	+ name: node
	+ creates: /usr/local/bin/node
	+ options:
	+ set:
	+ - BUNDLED_SSL
	+ - NLS
	+ unset:
	+ - DOCS
	+ - DTRACE
	+
	+ npm:
	+ category: www
	+ name: npm
	+ creates: /usr/local/bin/npm
	diff --git a/roles/devserver/userland-software/ports.sls b/roles/devserver/userland-software/ports.sls
	--- a/roles/devserver/userland-software/ports.sls
	+++ b/roles/devserver/userland-software/ports.sls
	@@ -14,6 +14,8 @@
	# Provision port options
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	+{% if 'options' in args %}
	+
	/var/db/ports/{{ args['category'] }}_{{ args['name'] }}/options:
	file.managed:
	- source: salt://roles/devserver/userland-software/files/port_options
	@@ -22,6 +24,8 @@
	- context:
	args: {{ args }}

	+{% endif %}
	+
	# -------------------------------------------------------------
	# Build and install package
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -