diff --git a/roles/shellserver/motd/files/eglide b/roles/core/motd/files/eglide similarity index 100% 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 similarity index 73% rename from roles/shellserver/motd/init.sls rename to roles/core/motd/init.sls index 4d9ea6d..2b57b56 100644 --- a/roles/shellserver/motd/init.sls +++ b/roles/core/motd/init.sls @@ -1,21 +1,21 @@ # ------------------------------------------------------------- # 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: file.absent: - name: /etc/update-motd.d/50-scw diff --git a/top.sls b/top.sls index 90431c6..a40b062 100644 --- a/top.sls +++ b/top.sls @@ -1,16 +1,17 @@ # ------------------------------------------------------------- # Salt configuration for Nasqueron servers # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2016-04-10 # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- base: '*': - roles/core/rc - roles/core/hostname - roles/core/network + - roles/core/motd 'eglide': - roles/shellserver/users - roles/shellserver/userland-software