saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update docs and help

Browse source
This commit is contained in:
twangboy 2017-12-20 19:43:26 -07:00
parent b6cecedbf6
commit 50b247a001
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/topics/installation/windows.rst
View file

@ -142,10 +142,8 @@ Option Description
.. note::
``/default-config`` and ``/custom-config=`` will backup an existing config
if found. A ``.bak`` extension will be added. That includes the ``minion``
file and the ``minion.d`` directory. If ``minion.bak`` or ``minion.d.bak``
already exist, they will be overwritten with a backup of the existing
config.
if found. A timestamp and a ``.bak`` extension will be added. That includes
the ``minion`` file and the ``minion.d`` directory.
Here are some examples of using the silent installer:

16
pkg/windows/installer/Salt-Minion-Setup.nsi
View file

@ -1417,11 +1417,9 @@ Function parseCommandLineSwitches
FileWrite $0 "$\t$\t$\tpassed, those values will be used to update the new$\n"
FileWrite $0 "$\t$\t$\tdefault config$\n"
FileWrite $0 "$\n"
FileWrite $0 "$\t$\t$\tAny existing config will be backed up using a .bak$\n"
FileWrite $0 "$\t$\t$\textension. That includes the minion file and the$\n"
FileWrite $0 "$\t$\t$\tminion.d directory. If minion.bak or minion.d.bak$\n"
FileWrite $0 "$\t$\t$\talready exist, they will be overwritten with a backup of$\n"
FileWrite $0 "$\t$\t$\tthe existing config$\n"
FileWrite $0 "$\t$\t$\tAny existing config will be backed up by appending$\n"
FileWrite $0 "$\t$\t$\ta timestamp and a .bak$ extension. That includes\n"
FileWrite $0 "$\t$\t$\tthe minion file and the minion.d directory$\n"
FileWrite $0 "$\n"
FileWrite $0 "/custom-config=$\t$\tA string value specifying the name of a custom config$\n"
FileWrite $0 "$\t$\t$\tfile in the same path as the installer or the full path$\n"
@ -1429,11 +1427,9 @@ Function parseCommandLineSwitches
FileWrite $0 "$\t$\t$\tis passed, those values will be used to update the new$\n"
FileWrite $0 "$\t$\t$\tcustom config$\n"
FileWrite $0 "$\n"
FileWrite $0 "$\t$\t$\tAny existing config will be backed up using a .bak$\n"
FileWrite $0 "$\t$\t$\textension. That includes the minion file and the$\n"
FileWrite $0 "$\t$\t$\tminion.d directory. If minion.bak or minion.d.bak$\n"
FileWrite $0 "$\t$\t$\talready exist, they will be overwritten with a backup of$\n"
FileWrite $0 "$\t$\t$\tthe existing config$\n"
FileWrite $0 "$\t$\t$\tAny existing config will be backed up by appending$\n"
FileWrite $0 "$\t$\t$\ta timestamp and a .bak$ extension. That includes\n"
FileWrite $0 "$\t$\t$\tthe minion file and the minion.d directory$\n"
FileWrite $0 "$\n"
FileWrite $0 "/S$\t$\t$\tInstall Salt silently$\n"
FileWrite $0 "$\n"