Merge pull request #104 from Perceptyx/banner_fix

Allow to configure SSH banner text in pillar
This commit is contained in:
Niels Abspoel 2017-07-28 10:49:52 +02:00 committed by GitHub
commit 6dba76fe56
5 changed files with 21 additions and 12 deletions

View File

@ -6,5 +6,10 @@ include:
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 %}

View File

@ -2,11 +2,11 @@ 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!

View File

@ -1,13 +1,13 @@
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!

View File

@ -1,7 +1,7 @@
{## 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
##} ##}

View File

@ -177,6 +177,10 @@ ssh_config:
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: