D405.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D405.diff
View Options

	diff --git a/roles/shellserver/motd/files/eglide b/roles/core/motd/files/eglide
	rename from roles/shellserver/motd/files/eglide
	rename to roles/core/motd/files/eglide
	diff --git a/roles/shellserver/motd/init.sls b/roles/core/motd/init.sls
	rename from roles/shellserver/motd/init.sls
	rename to roles/core/motd/init.sls
	--- a/roles/shellserver/motd/init.sls
	+++ b/roles/core/motd/init.sls
	@@ -1,19 +1,19 @@
	# -------------------------------------------------------------
	# Salt — MOTD
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Eglide
	+# Project: Nasqueron
	# Created: 2016-04-10
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	motd:
	file.managed:
	- {% if grains['os'] == 'FreeBSD' %}
	- - name: /etc/motd
	- {% elif grains['os'] == 'Debian' %}
	+ {% if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' %}
	- name: /etc/motd.tail
	+ {% else %}
	+ - name: /etc/motd
	{% endif %}
	- - source: salt://roles/shellserver/motd/files/{{ grains['id'] }}
	+ - source: salt://roles/core/motd/files/{{ grains['id'] }}

	# Fixes T858
	get_rid_of_scaleway_motd:
	diff --git a/top.sls b/top.sls
	--- a/top.sls
	+++ b/top.sls
	@@ -11,6 +11,7 @@
	- roles/core/rc
	- roles/core/hostname
	- roles/core/network
	+ - roles/core/motd
	'eglide':
	- roles/shellserver/users
	- roles/shellserver/userland-software