No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/roles/core/motd/files/motd b/roles/core/motd/files/motd
	new file mode 100644
	index 0000000..49b7a26
	--- /dev/null
	+++ b/roles/core/motd/files/motd
	@@ -0,0 +1,6 @@
	+#!/bin/sh
	+if [ -f /etc/motd ]; then
	+ cat /etc/motd
	+else
	+ echo "No MOTD."
	+fi
	diff --git a/roles/core/motd/init.sls b/roles/core/motd/init.sls
	index 2b57b56..c2685ee 100644
	--- a/roles/core/motd/init.sls
	+++ b/roles/core/motd/init.sls
	@@ -1,21 +1,26 @@
	# -------------------------------------------------------------
	# Salt — MOTD
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2016-04-10
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

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

	# Fixes T858
	get_rid_of_scaleway_motd:
	file.absent:
	- name: /etc/update-motd.d/50-scw
	+
	+/usr/local/bin/motd:
	+ file.managed:
	+ - source: salt://roles/core/motd/files/motd
	+ - mode: 755