Просмотр исходного кода

Merge pull request #97 from 0xf10e/toggle_source_url

Add optional {{ source }} to config files
master
Seth House 7 лет назад
Родитель
Сommit
8dbb1e9088
2 измененных файлов: 15 добавлений и 0 удалений
  1. +7
    -0
      openssh/files/ssh_config
  2. +8
    -0
      openssh/files/sshd_config

+ 7
- 0
openssh/files/ssh_config Просмотреть файл

@@ -73,6 +73,13 @@
# Do not edit this file manually!
# It will be overwritten by salt!
{%- endif %}
{%- set global_src_url = salt ['pillar.get']('__formulas:print_template_url', None) %}
{%- set local_src_url = salt ['pillar.get']('openssh-formula:print_template_url', None) %}
{%- if (global_src_url and local_src_url is none) or local_src_url %}
#
# Template used to generate this file:
# {{ source }}
{%- endif %}

{%- if 'Hosts' in ssh_config %}
{%- do processed_options.append('Hosts') %}

+ 8
- 0
openssh/files/sshd_config Просмотреть файл

@@ -66,6 +66,14 @@
{%- else -%}
# This file is managed by salt. Manual changes risk being overwritten.
{%- endif %}
{%- set global_src_url = salt ['pillar.get']('__formulas:print_template_url', None) %}
{%- set local_src_url = salt ['pillar.get']('openssh-formula:print_template_url', None) %}
{%- if (global_src_url and local_src_url is none) or local_src_url %}
#
# Template used to generate this file:
# {{ source }}
#
{%- endif %}
# The contents of the original sshd_config are kept on the bottom for
# quick reference.
# See the sshd_config(5) manpage for details

Загрузка…
Отмена
Сохранить