From dfdf86dc54b323a5c93c5d6b3b64efda9104424e Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Sun, 16 Feb 2020 16:58:58 +0100 Subject: [PATCH] feat(map.jinja): add documentation header to parameter files --- TEMPLATE/parameters/defaults.yaml | 1 + TEMPLATE/parameters/os/Amazon.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os/CentOS.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os/Fedora.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os/Funtoo.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os/Manjaro.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os/Raspbian.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os/SUSE.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os/SmartOS.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os/Ubuntu.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os/openSUSE.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os_family/Alpine.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os_family/Arch.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/os_family/Debian.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/os_family/FreeBSD.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/os_family/Gentoo.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os_family/MacOS.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os_family/OpenBSD.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/os_family/RedHat.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/os_family/Solaris.yaml | 15 +++++++++++++-- TEMPLATE/parameters/os_family/Suse.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/os_family/Windows.yaml | 15 +++++++++++++-- TEMPLATE/parameters/osarch/386.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/osarch/amd64.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/osarch/arm64.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/osarch/armv6l.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/osarch/armv7l.yaml | 16 ++++++++++++++-- TEMPLATE/parameters/osarch/ppc64le.yaml | 18 +++++++++++++++--- TEMPLATE/parameters/osarch/s390x.yaml | 15 +++++++++++++-- TEMPLATE/parameters/osarch/x86_64.yaml | 16 ++++++++++++++-- .../osfinger/Amazon Linux AMI-2018.yaml | 17 ++++++++++++++--- .../parameters/osfinger/Amazon Linux-2.yaml | 17 ++++++++++++++--- .../parameters/osfinger/CentOS Linux-7.yaml | 17 ++++++++++++++--- .../parameters/osfinger/CentOS Linux-8.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/CentOS-6.yaml | 18 +++++++++++++++--- TEMPLATE/parameters/osfinger/Debian-10.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/Debian-8.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/Debian-9.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/Fedora-30.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/Fedora-31.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/FreeBSD-12.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/Gentoo-2.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/Leap-15.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/Ubuntu-16.04.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/Ubuntu-18.04.yaml | 17 ++++++++++++++--- TEMPLATE/parameters/osfinger/Windows-8.1.yaml | 17 ++++++++++++++--- 46 files changed, 617 insertions(+), 107 deletions(-) diff --git a/TEMPLATE/parameters/defaults.yaml b/TEMPLATE/parameters/defaults.yaml index 11d124a4..f0ffcb71 100644 --- a/TEMPLATE/parameters/defaults.yaml +++ b/TEMPLATE/parameters/defaults.yaml @@ -26,3 +26,4 @@ map.jinja: - osfinger - roles - any/path/can/be/used/here.yaml +... diff --git a/TEMPLATE/parameters/os/Amazon.yaml b/TEMPLATE/parameters/os/Amazon.yaml index f480f81e..29ae24ad 100644 --- a/TEMPLATE/parameters/os/Amazon.yaml +++ b/TEMPLATE/parameters/os/Amazon.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == Amazon. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os/CentOS.yaml b/TEMPLATE/parameters/os/CentOS.yaml index fecd0ee1..da221cdb 100644 --- a/TEMPLATE/parameters/os/CentOS.yaml +++ b/TEMPLATE/parameters/os/CentOS.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == CentOS. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os/Fedora.yaml b/TEMPLATE/parameters/os/Fedora.yaml index 31be1264..52f393e3 100644 --- a/TEMPLATE/parameters/os/Fedora.yaml +++ b/TEMPLATE/parameters/os/Fedora.yaml @@ -2,15 +2,26 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == Fedora. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: pkg: name: TEMPLATE-fedora service: name: service-fedora +... diff --git a/TEMPLATE/parameters/os/Funtoo.yaml b/TEMPLATE/parameters/os/Funtoo.yaml index 823f98ec..7665383e 100644 --- a/TEMPLATE/parameters/os/Funtoo.yaml +++ b/TEMPLATE/parameters/os/Funtoo.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == Funtoo. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os/Manjaro.yaml b/TEMPLATE/parameters/os/Manjaro.yaml index c204afc2..d99be9f4 100644 --- a/TEMPLATE/parameters/os/Manjaro.yaml +++ b/TEMPLATE/parameters/os/Manjaro.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == Manjaro. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os/Raspbian.yaml b/TEMPLATE/parameters/os/Raspbian.yaml index b1e11177..5edbb2df 100644 --- a/TEMPLATE/parameters/os/Raspbian.yaml +++ b/TEMPLATE/parameters/os/Raspbian.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == Raspbian. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os/SUSE.yaml b/TEMPLATE/parameters/os/SUSE.yaml index 54f03049..5bc4e8d4 100644 --- a/TEMPLATE/parameters/os/SUSE.yaml +++ b/TEMPLATE/parameters/os/SUSE.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == SUSE. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os/SmartOS.yaml b/TEMPLATE/parameters/os/SmartOS.yaml index eee469f8..5f6e19ce 100644 --- a/TEMPLATE/parameters/os/SmartOS.yaml +++ b/TEMPLATE/parameters/os/SmartOS.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == SmartOS. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os/Ubuntu.yaml b/TEMPLATE/parameters/os/Ubuntu.yaml index 8e3feb23..4dc91395 100644 --- a/TEMPLATE/parameters/os/Ubuntu.yaml +++ b/TEMPLATE/parameters/os/Ubuntu.yaml @@ -2,14 +2,25 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == Ubuntu. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: pkg: name: TEMPLATE-ubuntu config: /etc/TEMPLATE.d/custom-ubuntu.conf +... diff --git a/TEMPLATE/parameters/os/openSUSE.yaml b/TEMPLATE/parameters/os/openSUSE.yaml index 2d3649ca..ae9e4f99 100644 --- a/TEMPLATE/parameters/os/openSUSE.yaml +++ b/TEMPLATE/parameters/os/openSUSE.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os') == openSUSE. -# You just need to add the key:values for an `os` that differ +# You just need to add the key:values for this `os` that differ # from `defaults.yaml` + `.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os` grain, +# If you do not need to provide defaults via the `os` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os_family/Alpine.yaml b/TEMPLATE/parameters/os_family/Alpine.yaml index 2edfc543..cc7ee8e3 100644 --- a/TEMPLATE/parameters/os_family/Alpine.yaml +++ b/TEMPLATE/parameters/os_family/Alpine.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == Alpine. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os_family/Arch.yaml b/TEMPLATE/parameters/os_family/Arch.yaml index 87fb4b65..a4869499 100644 --- a/TEMPLATE/parameters/os_family/Arch.yaml +++ b/TEMPLATE/parameters/os_family/Arch.yaml @@ -2,15 +2,27 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == Arch. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: pkg: name: TEMPLATE-arch service: name: service-arch + +... diff --git a/TEMPLATE/parameters/os_family/Debian.yaml b/TEMPLATE/parameters/os_family/Debian.yaml index 7db73ee7..0a80badb 100644 --- a/TEMPLATE/parameters/os_family/Debian.yaml +++ b/TEMPLATE/parameters/os_family/Debian.yaml @@ -2,14 +2,26 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == Debian. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: pkg: name: TEMPLATE-debian config: /etc/TEMPLATE.d/custom.conf + +... diff --git a/TEMPLATE/parameters/os_family/FreeBSD.yaml b/TEMPLATE/parameters/os_family/FreeBSD.yaml index 027a558f..10fe884c 100644 --- a/TEMPLATE/parameters/os_family/FreeBSD.yaml +++ b/TEMPLATE/parameters/os_family/FreeBSD.yaml @@ -2,12 +2,24 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == FreeBSD. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: rootgroup: wheel + +... diff --git a/TEMPLATE/parameters/os_family/Gentoo.yaml b/TEMPLATE/parameters/os_family/Gentoo.yaml index aad37295..d5b82d47 100644 --- a/TEMPLATE/parameters/os_family/Gentoo.yaml +++ b/TEMPLATE/parameters/os_family/Gentoo.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == Gentoo. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os_family/MacOS.yaml b/TEMPLATE/parameters/os_family/MacOS.yaml index cf503e63..14028d58 100644 --- a/TEMPLATE/parameters/os_family/MacOS.yaml +++ b/TEMPLATE/parameters/os_family/MacOS.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == MacOS. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os_family/OpenBSD.yaml b/TEMPLATE/parameters/os_family/OpenBSD.yaml index 91b1be1b..87da0cc8 100644 --- a/TEMPLATE/parameters/os_family/OpenBSD.yaml +++ b/TEMPLATE/parameters/os_family/OpenBSD.yaml @@ -2,12 +2,24 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == OpenBSD. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: rootgroup: wheel + +... diff --git a/TEMPLATE/parameters/os_family/RedHat.yaml b/TEMPLATE/parameters/os_family/RedHat.yaml index 0333fdd5..99b0cb23 100644 --- a/TEMPLATE/parameters/os_family/RedHat.yaml +++ b/TEMPLATE/parameters/os_family/RedHat.yaml @@ -2,14 +2,26 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == RedHat. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: pkg: name: TEMPLATE-redhat config: /etc/TEMPLATE.conf + +... diff --git a/TEMPLATE/parameters/os_family/Solaris.yaml b/TEMPLATE/parameters/os_family/Solaris.yaml index a5a146f5..ee34401d 100644 --- a/TEMPLATE/parameters/os_family/Solaris.yaml +++ b/TEMPLATE/parameters/os_family/Solaris.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == Solaris. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/os_family/Suse.yaml b/TEMPLATE/parameters/os_family/Suse.yaml index 8cfc61ca..134c9159 100644 --- a/TEMPLATE/parameters/os_family/Suse.yaml +++ b/TEMPLATE/parameters/os_family/Suse.yaml @@ -2,13 +2,25 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == Suse. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: pkg: name: TEMPLATE-suse + +... diff --git a/TEMPLATE/parameters/os_family/Windows.yaml b/TEMPLATE/parameters/os_family/Windows.yaml index e2afb584..30e89c3c 100644 --- a/TEMPLATE/parameters/os_family/Windows.yaml +++ b/TEMPLATE/parameters/os_family/Windows.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('os_family') == Windows. -# You just need to add the key:values for an `os_family` that differ +# You just need to add the key:values for this `os_family` that differ # from `defaults.yaml` + `.yaml`. # -# If you do not need to provide defaults via the `os_family` grain, +# If you do not need to provide defaults via the `os_family` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osarch/386.yaml b/TEMPLATE/parameters/osarch/386.yaml index fbabd7fb..c63150ba 100644 --- a/TEMPLATE/parameters/osarch/386.yaml +++ b/TEMPLATE/parameters/osarch/386.yaml @@ -2,12 +2,24 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osarch') == 386. -# You just need to add the key:values for an `osarch` that differ +# You just need to add the key:values for this `osarch` that differ # from `defaults.yaml`. # -# If you do not need to provide defaults via the `osarch` grain, +# If you do not need to provide defaults via the `osarch` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: arch: 386 + +... diff --git a/TEMPLATE/parameters/osarch/amd64.yaml b/TEMPLATE/parameters/osarch/amd64.yaml index 51388601..9df179c1 100644 --- a/TEMPLATE/parameters/osarch/amd64.yaml +++ b/TEMPLATE/parameters/osarch/amd64.yaml @@ -2,12 +2,24 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osarch') == amd64. -# You just need to add the key:values for an `osarch` that differ +# You just need to add the key:values for this `osarch` that differ # from `defaults.yaml`. # -# If you do not need to provide defaults via the `osarch` grain, +# If you do not need to provide defaults via the `osarch` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: arch: amd64 + +... diff --git a/TEMPLATE/parameters/osarch/arm64.yaml b/TEMPLATE/parameters/osarch/arm64.yaml index 2ee0e579..3ee7f6ff 100644 --- a/TEMPLATE/parameters/osarch/arm64.yaml +++ b/TEMPLATE/parameters/osarch/arm64.yaml @@ -2,12 +2,24 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osarch') == arm64. -# You just need to add the key:values for an `osarch` that differ +# You just need to add the key:values for this `osarch` that differ # from `defaults.yaml`. # -# If you do not need to provide defaults via the `osarch` grain, +# If you do not need to provide defaults via the `osarch` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: arch: arm64 + +... diff --git a/TEMPLATE/parameters/osarch/armv6l.yaml b/TEMPLATE/parameters/osarch/armv6l.yaml index 582e6fd9..2f53e083 100644 --- a/TEMPLATE/parameters/osarch/armv6l.yaml +++ b/TEMPLATE/parameters/osarch/armv6l.yaml @@ -2,12 +2,24 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osarch') == armv6l. -# You just need to add the key:values for an `osarch` that differ +# You just need to add the key:values for this `osarch` that differ # from `defaults.yaml`. # -# If you do not need to provide defaults via the `osarch` grain, +# If you do not need to provide defaults via the `osarch` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: arch: armv6l + +... diff --git a/TEMPLATE/parameters/osarch/armv7l.yaml b/TEMPLATE/parameters/osarch/armv7l.yaml index 8c602714..f22f18c9 100644 --- a/TEMPLATE/parameters/osarch/armv7l.yaml +++ b/TEMPLATE/parameters/osarch/armv7l.yaml @@ -2,12 +2,24 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osarch') == armv7l. -# You just need to add the key:values for an `osarch` that differ +# You just need to add the key:values for this `osarch` that differ # from `defaults.yaml`. # -# If you do not need to provide defaults via the `osarch` grain, +# If you do not need to provide defaults via the `osarch` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: arch: armv7l + +... diff --git a/TEMPLATE/parameters/osarch/ppc64le.yaml b/TEMPLATE/parameters/osarch/ppc64le.yaml index eff12f15..9c9aaf60 100644 --- a/TEMPLATE/parameters/osarch/ppc64le.yaml +++ b/TEMPLATE/parameters/osarch/ppc64le.yaml @@ -1,13 +1,25 @@ # -*- coding: utf-8 -*- # vim: ft=yaml # -# Setup variables specific to salt['config.get']('osarch') osarchmap. -# You just need to add the key:values for an `osarch` that differ +# Setup variables specific to salt['config.get']('osarch') == ppc64le. +# You just need to add the key:values for this `osarch` that differ # from `defaults.yaml`. # -# If you do not need to provide defaults via the `osarch` grain, +# If you do not need to provide defaults via the `osarch` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: arch: ppc64le + +... diff --git a/TEMPLATE/parameters/osarch/s390x.yaml b/TEMPLATE/parameters/osarch/s390x.yaml index 308f8fdc..ab24eca6 100644 --- a/TEMPLATE/parameters/osarch/s390x.yaml +++ b/TEMPLATE/parameters/osarch/s390x.yaml @@ -2,12 +2,23 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osarch') == s390x. -# You just need to add the key:values for an `osarch` that differ +# You just need to add the key:values for this `osarch` that differ # from `defaults.yaml`. # -# If you do not need to provide defaults via the `osarch` grain, +# If you do not need to provide defaults via the `osarch` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: arch: s390x +... diff --git a/TEMPLATE/parameters/osarch/x86_64.yaml b/TEMPLATE/parameters/osarch/x86_64.yaml index b01cca99..51b17d02 100644 --- a/TEMPLATE/parameters/osarch/x86_64.yaml +++ b/TEMPLATE/parameters/osarch/x86_64.yaml @@ -2,12 +2,24 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osarch') == x86_64. -# You just need to add the key:values for an `osarch` that differ +# You just need to add the key:values for this `osarch` that differ # from `defaults.yaml`. # -# If you do not need to provide defaults via the `osarch` grain, +# If you do not need to provide defaults via the `osarch` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: arch: amd64 + +... diff --git a/TEMPLATE/parameters/osfinger/Amazon Linux AMI-2018.yaml b/TEMPLATE/parameters/osfinger/Amazon Linux AMI-2018.yaml index 97f03c9e..36db3f1f 100644 --- a/TEMPLATE/parameters/osfinger/Amazon Linux AMI-2018.yaml +++ b/TEMPLATE/parameters/osfinger/Amazon Linux AMI-2018.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Amazon Linux AMI-2018. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/Amazon Linux-2.yaml b/TEMPLATE/parameters/osfinger/Amazon Linux-2.yaml index 93631598..d01b29d6 100644 --- a/TEMPLATE/parameters/osfinger/Amazon Linux-2.yaml +++ b/TEMPLATE/parameters/osfinger/Amazon Linux-2.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Amazon Linux-2. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/CentOS Linux-7.yaml b/TEMPLATE/parameters/osfinger/CentOS Linux-7.yaml index a63144fd..377b5a51 100644 --- a/TEMPLATE/parameters/osfinger/CentOS Linux-7.yaml +++ b/TEMPLATE/parameters/osfinger/CentOS Linux-7.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == CentOS Linux-7. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/CentOS Linux-8.yaml b/TEMPLATE/parameters/osfinger/CentOS Linux-8.yaml index 9953de36..3c44f6da 100644 --- a/TEMPLATE/parameters/osfinger/CentOS Linux-8.yaml +++ b/TEMPLATE/parameters/osfinger/CentOS Linux-8.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == CentOS Linux-8. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/CentOS-6.yaml b/TEMPLATE/parameters/osfinger/CentOS-6.yaml index 06226a32..f7c1bd22 100644 --- a/TEMPLATE/parameters/osfinger/CentOS-6.yaml +++ b/TEMPLATE/parameters/osfinger/CentOS-6.yaml @@ -2,14 +2,26 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == CentOS-6. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: pkg: name: TEMPLATE-centos-6 config: /etc/TEMPLATE.d/custom-centos-6.conf + +... diff --git a/TEMPLATE/parameters/osfinger/Debian-10.yaml b/TEMPLATE/parameters/osfinger/Debian-10.yaml index ceac8234..405fd829 100644 --- a/TEMPLATE/parameters/osfinger/Debian-10.yaml +++ b/TEMPLATE/parameters/osfinger/Debian-10.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Debian-10. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/Debian-8.yaml b/TEMPLATE/parameters/osfinger/Debian-8.yaml index 0de44e0d..1986cf03 100644 --- a/TEMPLATE/parameters/osfinger/Debian-8.yaml +++ b/TEMPLATE/parameters/osfinger/Debian-8.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Debian-8. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/Debian-9.yaml b/TEMPLATE/parameters/osfinger/Debian-9.yaml index 1979ff44..23763b97 100644 --- a/TEMPLATE/parameters/osfinger/Debian-9.yaml +++ b/TEMPLATE/parameters/osfinger/Debian-9.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Debian-9. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/Fedora-30.yaml b/TEMPLATE/parameters/osfinger/Fedora-30.yaml index 5e913993..fe087626 100644 --- a/TEMPLATE/parameters/osfinger/Fedora-30.yaml +++ b/TEMPLATE/parameters/osfinger/Fedora-30.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Fedora-30. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/Fedora-31.yaml b/TEMPLATE/parameters/osfinger/Fedora-31.yaml index e5cd692b..b814854e 100644 --- a/TEMPLATE/parameters/osfinger/Fedora-31.yaml +++ b/TEMPLATE/parameters/osfinger/Fedora-31.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Fedora-31. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/FreeBSD-12.yaml b/TEMPLATE/parameters/osfinger/FreeBSD-12.yaml index 39bf7bfb..542cef9f 100644 --- a/TEMPLATE/parameters/osfinger/FreeBSD-12.yaml +++ b/TEMPLATE/parameters/osfinger/FreeBSD-12.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == FreeBSD-12. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/Gentoo-2.yaml b/TEMPLATE/parameters/osfinger/Gentoo-2.yaml index ca7dd522..b06f4e69 100644 --- a/TEMPLATE/parameters/osfinger/Gentoo-2.yaml +++ b/TEMPLATE/parameters/osfinger/Gentoo-2.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Gentoo-2. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/Leap-15.yaml b/TEMPLATE/parameters/osfinger/Leap-15.yaml index e55e9eaa..9a07b706 100644 --- a/TEMPLATE/parameters/osfinger/Leap-15.yaml +++ b/TEMPLATE/parameters/osfinger/Leap-15.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Leap-15. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/Ubuntu-16.04.yaml b/TEMPLATE/parameters/osfinger/Ubuntu-16.04.yaml index b9ee9bbd..9713a80e 100644 --- a/TEMPLATE/parameters/osfinger/Ubuntu-16.04.yaml +++ b/TEMPLATE/parameters/osfinger/Ubuntu-16.04.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Ubuntu-16.04. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +... diff --git a/TEMPLATE/parameters/osfinger/Ubuntu-18.04.yaml b/TEMPLATE/parameters/osfinger/Ubuntu-18.04.yaml index 8a734209..c16dbda9 100644 --- a/TEMPLATE/parameters/osfinger/Ubuntu-18.04.yaml +++ b/TEMPLATE/parameters/osfinger/Ubuntu-18.04.yaml @@ -2,12 +2,23 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Ubuntu-18.04. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: config: /etc/TEMPLATE.d/custom-ubuntu-18.04.conf +... diff --git a/TEMPLATE/parameters/osfinger/Windows-8.1.yaml b/TEMPLATE/parameters/osfinger/Windows-8.1.yaml index ac849368..536edb5f 100644 --- a/TEMPLATE/parameters/osfinger/Windows-8.1.yaml +++ b/TEMPLATE/parameters/osfinger/Windows-8.1.yaml @@ -2,11 +2,22 @@ # vim: ft=yaml # # Setup variables specific to salt['config.get']('osfinger') == Windows-8.1. -# You just need to add the key:values for an `osfinger` that differ -# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# You just need to add the key:values for this `osfinger` that differ +# from `defaults.yaml`. # -# If you do not need to provide defaults via the `os_finger` grain, +# If you do not need to provide defaults via the `osfinger` config, # you can remove this file or provide at least an empty dict, e.g. # values: {} +# +# This file will be merged with `salt.slsutil.merge`: +# +# You can select the merging strategy by defining the `strategy` dict +# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g. +# strategy: 'recurse' +# +# If you use the `recurse` or `overwrite` strategy, you can aggregate +# the lists by defining the `merge_lists` dict with a boolean, e.g. +# merge_lists: 'true' --- values: {} +...