Page MenuHomeDevCentral
Files F7690708

D1130.id2886.diff
No OneTemporary
Actions

D1130.id2886.diff
View Options

diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -142,3 +142,22 @@
'verbiste': 'fr-verbiste',
},
}, default='Debian') %}
+
+{# -------------------------------------------------------------
+ Capabilities of OS and distributions
+
+ :: MOTD-printed-at-login
+ Login mechanism, through PAM or dotfiles,
+ prints the MOTD when a session is opened.
+
+ When at False, OpenSSH will take care of it.
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #}
+
+{% set capabilities = salt['grains.filter_by']({
+ 'Debian': {
+ 'MOTD-printed-at-login': True,
+ },
+ 'FreeBSD' : {
+ 'MOTD-printed-at-login': False,
+ },
+}, default='FreeBSD') %}
diff --git a/roles/core/sshd/files/sshd_config b/roles/core/sshd/files/sshd_config
--- a/roles/core/sshd/files/sshd_config
+++ b/roles/core/sshd/files/sshd_config
@@ -25,7 +25,7 @@
UsePAM yes
# Misc options
-PrintMotd no
+PrintMotd {{ print_motd }}
AcceptEnv LANG LC_*
# SFTP
diff --git a/roles/core/sshd/init.sls b/roles/core/sshd/init.sls
--- a/roles/core/sshd/init.sls
+++ b/roles/core/sshd/init.sls
@@ -6,18 +6,22 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-{% from "map.jinja" import paths with context %}
+{% from "map.jinja" import paths, capabilities with context %}
# -------------------------------------------------------------
# OpenSSH
# -------------------------------------------------------------
+{% set print_motd = '"no"' if capabilities['MOTD-printed-at-login']
+ else '"yes"' %}
+
/etc/ssh/sshd_config:
file.managed:
- source: salt://roles/core/sshd/files/sshd_config
- template: jinja
- context:
sftp: {{ paths.sftp }}
+ print_motd: {{ print_motd }}
# -------------------------------------------------------------
# PAM

File Metadata

Mime Type
text/plain
Expires
Fri, May 2, 03:58 (53 m, 37 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2623360
Default Alt Text
D1130.id2886.diff (1 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator