Browse Source

Merge pull request #104 from Perceptyx/banner_fix

Allow to configure SSH banner text in pillar
tags/v0.41.0
Niels Abspoel 7 years ago
parent
commit
6dba76fe56
5 changed files with 21 additions and 12 deletions
  1. +5
    -0
      openssh/banner.sls
  2. +3
    -3
      openssh/files/banner
  3. +8
    -8
      openssh/files/fire_banner
  4. +1
    -1
      openssh/map.jinja
  5. +4
    -0
      pillar.example

+ 5
- 0
openssh/banner.sls View File

sshd_banner: sshd_banner:
file.managed: file.managed:
- name: {{ openssh.banner }} - name: {{ openssh.banner }}
{% if openssh.banner_string is defined %}
- contents: |
{{ openssh.banner_string }}
{% else %}
- source: {{ openssh.banner_src }} - source: {{ openssh.banner_src }}
- template: jinja - template: jinja
{% endif %}

+ 3
- 3
openssh/files/banner View File



Managed By Managed By


_____ ____ _____ __ __
_____ ____ _____ __ __
/ ___/____ _/ / /_/ ___// /_____ ______/ /__ / ___/____ _/ / /_/ ___// /_____ ______/ /__
\__ \/ __ `/ / __/\__ \/ __/ __ `/ ___/ //_/ \__ \/ __ `/ / __/\__ \/ __/ __ `/ ___/ //_/
___/ / /_/ / / /_ ___/ / /_/ /_/ / /__/ ,<
/____/\__,_/_/\__//____/\__/\__,_/\___/_/|_|
___/ / /_/ / / /_ ___/ / /_/ /_/ / /__/ ,<
/____/\__,_/_/\__//____/\__/\__,_/\___/_/|_|




Make sure changes get pushed into the state repo! Make sure changes get pushed into the state repo!

+ 8
- 8
openssh/files/fire_banner View File

Welcome to {{ grains['id'] }}! Welcome to {{ grains['id'] }}!


Managed By Managed By
( (
)\ ) ( ) )\ ) ) )
(()/( ) )\ ( /((()/( ( /( ) ( /(
/(_))( /( ((_))\())/(_)))\())( /( ( )\())
(_)) )(_)) _ (_))/(_)) (_))/ )(_)) )\ ((_)\
/ __|((_)_ | || |_ / __|| |_ ((_)_ ((_)| |(_)
\__ \/ _` || || _|\__ \| _|/ _` |/ _| | / /
|___/\__,_||_| \__||___/ \__|\__,_|\__| |_\_\
( (
)\ ) ( ) )\ ) ) )
(()/( ) )\ ( /((()/( ( /( ) ( /(
/(_))( /( ((_))\())/(_)))\())( /( ( )\())
(_)) )(_)) _ (_))/(_)) (_))/ )(_)) )\ ((_)\
/ __|((_)_ | || |_ / __|| |_ ((_)_ ((_)| |(_)
\__ \/ _` || || _|\__ \| _|/ _` |/ _| | / /
|___/\__,_||_| \__||___/ \__|\__,_|\__| |_\_\


Make sure changes get pushed into the state repo! Make sure changes get pushed into the state repo!

+ 1
- 1
openssh/map.jinja View File

{## Start with defaults from defaults.yaml ##} {## Start with defaults from defaults.yaml ##}
{% import_yaml "openssh/defaults.yaml" as default_settings %} {% import_yaml "openssh/defaults.yaml" as default_settings %}


{##
{##
Setup variable using grains['os_family'] based logic, only add key:values here Setup variable using grains['os_family'] based logic, only add key:values here
that differ from whats in defaults.yaml that differ from whats in defaults.yaml
##} ##}

+ 4
- 0
pillar.example View File





openssh: 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 # Controls if SSHD should be enabled/started
sshd_enable: true sshd_enable: true
auth: auth:

Loading…
Cancel
Save