Merge pull request #104 from Perceptyx/banner_fix

Allow to configure SSH banner text in pillar

openssh/banner.sls

@@ -6,5 +6,10 @@ include:
 sshd_banner:
   file.managed:
     - name: {{ openssh.banner }}
+    {% if openssh.banner_string is defined %}
+    - contents: |
+        {{ openssh.banner_string }}
+    {% else %}
     - source: {{ openssh.banner_src }}
     - template: jinja
+    {% endif %}

openssh/files/banner

@@ -2,11 +2,11 @@ Welcome to {{ grains['id'] }}!
 
 Managed By
 
-   _____       ____  _____ __             __  
+   _____       ____  _____ __             __
   / ___/____ _/ / /_/ ___// /_____ ______/ /__
   \__ \/ __ `/ / __/\__ \/ __/ __ `/ ___/ //_/
- ___/ / /_/ / / /_ ___/ / /_/ /_/ / /__/ ,<   
-/____/\__,_/_/\__//____/\__/\__,_/\___/_/|_|  
+ ___/ / /_/ / / /_ ___/ / /_/ /_/ / /__/ ,<
+/____/\__,_/_/\__//____/\__/\__,_/\___/_/|_|
 
 
 Make sure changes get pushed into the state repo!

openssh/files/fire_banner

@@ -1,13 +1,13 @@
 Welcome to {{ grains['id'] }}!
 
 Managed By
- (                  (                          
- )\ )       (     ) )\ )    )               )  
-(()/(    )  )\ ( /((()/( ( /(    )       ( /(  
- /(_))( /( ((_))\())/(_)))\())( /(   (   )\()) 
-(_))  )(_)) _ (_))/(_)) (_))/ )(_))  )\ ((_)\  
-/ __|((_)_ | || |_ / __|| |_ ((_)_  ((_)| |(_) 
-\__ \/ _` || ||  _|\__ \|  _|/ _` |/ _| | / /  
-|___/\__,_||_| \__||___/ \__|\__,_|\__| |_\_\  
+ (                  (
+ )\ )       (     ) )\ )    )               )
+(()/(    )  )\ ( /((()/( ( /(    )       ( /(
+ /(_))( /( ((_))\())/(_)))\())( /(   (   )\())
+(_))  )(_)) _ (_))/(_)) (_))/ )(_))  )\ ((_)\
+/ __|((_)_ | || |_ / __|| |_ ((_)_  ((_)| |(_)
+\__ \/ _` || ||  _|\__ \|  _|/ _` |/ _| | / /
+|___/\__,_||_| \__||___/ \__|\__,_|\__| |_\_\
 
 Make sure changes get pushed into the state repo!

openssh/map.jinja

@@ -1,7 +1,7 @@
 {## Start with  defaults from defaults.yaml ##}
 {% import_yaml "openssh/defaults.yaml" as default_settings %}
 
-{## 
+{##
 Setup variable using grains['os_family'] based logic, only add key:values here
 that differ from whats in defaults.yaml
 ##}

pillar.example

@@ -177,6 +177,10 @@ ssh_config:
 
 
 openssh:
+  # Instead of adding a custom banner file you can set it in pillar
+  banner_string: |
+    Welcome to {{ grains['id'] }}!
+
   # Controls if SSHD should be enabled/started
   sshd_enable: true
   auth: