D1372.diff
No OneTemporary
Actions

Size

738 B

Referenced Files

None

Subscribers

None

D1372.diff
View Options

	diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
	--- a/pillar/nodes/nodes.sls
	+++ b/pillar/nodes/nodes.sls
	@@ -59,3 +59,5 @@
	- shellserver
	network:
	ipv6_tunnel: True
	+ fixes:
	+ rsyslog_xconsole: True
	diff --git a/roles/core/rsyslog/init.sls b/roles/core/rsyslog/init.sls
	--- a/roles/core/rsyslog/init.sls
	+++ b/roles/core/rsyslog/init.sls
	@@ -12,7 +12,7 @@
	# See http://kb.monitorware.com/kbeventdb-detail-id-6925.html
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	-{% if salt['file.directory_exists' ]('/etc/rsyslog.d') %}
	+{% if salt['node.has']('fixes:rsyslog_xconsole') %}
	/etc/rsyslog.d/50-default.conf:
	file.managed:
	- name : /etc/rsyslog.d/50-default.conf