From e474d0416b19e37d5591161c9d3398424f0f0480 Mon Sep 17 00:00:00 2001 From: ddoh94 Date: Fri, 19 Jan 2018 10:41:48 -0700 Subject: [PATCH] update winrepo_source_dir document The winrepo_source_dir minion config can be set with or without a master. It is currently documented as only available if the minion is running in masterless mode. I have updated the documentation to reflect that it will work in master or masterless mode. --- doc/ref/configuration/minion.rst | 34 ++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst index 1545c28a55..4e365b054d 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst @@ -2750,6 +2750,27 @@ the metadata will be refreshed. .. _winrepo-minion-config-opts: +Minion Windows Software Repo Settings +===================================== + +.. important:: + To use these config options, the minion can be running in master-minion or + masterless mode. + + +.. conf_minion:: winrepo_source_dir + +``winrepo_source_dir`` +---------------------- + +Default: ``salt://win/repo-ng/`` + +The source location for the winrepo sls files. + +.. code-block:: yaml + + winrepo_source_dir: salt://win/repo-ng/ + Standalone Minion Windows Software Repo Settings ================================================ @@ -2793,19 +2814,6 @@ out for 2015.8.0 and later minions. winrepo_dir_ng: /srv/salt/win/repo-ng -.. conf_minion:: winrepo_source_dir - -``winrepo_source_dir`` ----------------------- - -Default: ``salt://win/repo-ng/`` - -The source location for the winrepo sls files. - -.. code-block:: yaml - - winrepo_source_dir: salt://win/repo-ng/ - .. conf_minion:: winrepo_cachefile .. conf_minion:: win_repo_cachefile