mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
Minor rST indentatation fixes to the Windows install docs
This commit is contained in:
parent
eb4bb2943b
commit
a4abb798db
@ -131,7 +131,8 @@ installer:
|
|||||||
Setting up a Windows build environment
|
Setting up a Windows build environment
|
||||||
======================================
|
======================================
|
||||||
|
|
||||||
1. Install the Microsoft Visual C++ 2008 SP1 Redistributable, `vcredist_x86`_ or `vcredist_x64`_.
|
1. Install the Microsoft Visual C++ 2008 SP1 Redistributable, `vcredist_x86`_
|
||||||
|
or `vcredist_x64`_.
|
||||||
|
|
||||||
2. Install `msysgit`_
|
2. Install `msysgit`_
|
||||||
|
|
||||||
@ -141,7 +142,8 @@ Setting up a Windows build environment
|
|||||||
|
|
||||||
git clone git://github.com/saltstack/salt.git
|
git clone git://github.com/saltstack/salt.git
|
||||||
|
|
||||||
4. Install the latest point release of `Python 2.7`_ for the architecture you wish to target
|
4. Install the latest point release of `Python 2.7`_ for the architecture you
|
||||||
|
wish to target
|
||||||
|
|
||||||
5. Add C:\\Python27 and C:\\Python27\\Scripts to your system path
|
5. Add C:\\Python27 and C:\\Python27\\Scripts to your system path
|
||||||
|
|
||||||
@ -159,11 +161,13 @@ Setting up a Windows build environment
|
|||||||
|
|
||||||
8. Install the latest point release of `OpenSSL for Windows`_
|
8. Install the latest point release of `OpenSSL for Windows`_
|
||||||
|
|
||||||
#. During setup, choose first option to install in Windows system directory
|
#. During setup, choose first option to install in Windows system
|
||||||
|
directory
|
||||||
|
|
||||||
9. Install the latest point release of `M2Crypto`_
|
9. Install the latest point release of `M2Crypto`_
|
||||||
|
|
||||||
#. In general, be sure to download installers targeted at py2.7 for your chosen architecture
|
#. In general, be sure to download installers targeted at py2.7 for your
|
||||||
|
chosen architecture
|
||||||
|
|
||||||
10. Install the latest point release of `pycrypto`_
|
10. Install the latest point release of `pycrypto`_
|
||||||
|
|
||||||
@ -224,8 +228,9 @@ Setting up a Windows build environment
|
|||||||
|
|
||||||
python setup.py bdist_esky
|
python setup.py bdist_esky
|
||||||
|
|
||||||
A zip file has been created in the ``dist/`` folder, containing a frozen copy of Python and the
|
A zip file has been created in the ``dist/`` folder, containing a frozen copy
|
||||||
dependency libraries, along with Windows executables for each of the Salt scripts.
|
of Python and the dependency libraries, along with Windows executables for each
|
||||||
|
of the Salt scripts.
|
||||||
|
|
||||||
|
|
||||||
Building the installer
|
Building the installer
|
||||||
@ -233,9 +238,9 @@ Building the installer
|
|||||||
|
|
||||||
The Salt Windows installer is built with the open-source NSIS compiler. The
|
The Salt Windows installer is built with the open-source NSIS compiler. The
|
||||||
source for the installer is found in the pkg directory of the Salt repo here:
|
source for the installer is found in the pkg directory of the Salt repo here:
|
||||||
https://github.com/saltstack/salt/tree/develop/pkg/windows/installer/Salt-Minion-Setup.nsi.
|
:blob:`pkg/windows/installer/Salt-Minion-Setup.nsi`. To create the installer,
|
||||||
To create the installer, extract the frozen archive from ``dist/`` into ``pkg/windows/buildenv/``
|
extract the frozen archive from ``dist/`` into ``pkg/windows/buildenv/`` and
|
||||||
and run NSIS.
|
run NSIS.
|
||||||
|
|
||||||
The NSIS installer can be found here: http://nsis.sourceforge.net/Main_Page
|
The NSIS installer can be found here: http://nsis.sourceforge.net/Main_Page
|
||||||
|
|
||||||
@ -245,7 +250,8 @@ Testing the Salt minion
|
|||||||
|
|
||||||
1. Create the directory C:\\salt (if it doesn't exist already)
|
1. Create the directory C:\\salt (if it doesn't exist already)
|
||||||
|
|
||||||
2. Copy the example ``conf`` and ``var`` directories from ``pkg/windows/buildenv/`` into C:\\salt
|
2. Copy the example ``conf`` and ``var`` directories from
|
||||||
|
``pkg/windows/buildenv/`` into C:\\salt
|
||||||
|
|
||||||
3. Edit C:\\salt\\conf\\minion
|
3. Edit C:\\salt\\conf\\minion
|
||||||
|
|
||||||
@ -266,24 +272,26 @@ Testing the Salt minion
|
|||||||
|
|
||||||
sudo salt-key -A
|
sudo salt-key -A
|
||||||
|
|
||||||
(This accepts all unaccepted keys. If you're concerned about security just accept the key for this specific minion)
|
This accepts all unaccepted keys. If you're concerned about security just
|
||||||
|
accept the key for this specific minion.
|
||||||
|
|
||||||
6. Test that your minion is responding
|
6. Test that your minion is responding
|
||||||
|
|
||||||
a. On the salt-master run:
|
On the salt-master run:
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
sudo salt '*' test.ping
|
sudo salt '*' test.ping
|
||||||
|
|
||||||
|
|
||||||
You should get the following response: {'your minion hostname': True}
|
You should get the following response: ``{'your minion hostname': True}``
|
||||||
|
|
||||||
|
|
||||||
Single command bootstrap script
|
Single command bootstrap script
|
||||||
===============================
|
===============================
|
||||||
|
|
||||||
On a 64 bit Windows host the following script makes an unattended install of salt, including all dependencies:
|
On a 64 bit Windows host the following script makes an unattended install of
|
||||||
|
salt, including all dependencies:
|
||||||
|
|
||||||
.. admonition:: Not up to date.
|
.. admonition:: Not up to date.
|
||||||
|
|
||||||
@ -291,9 +299,9 @@ On a 64 bit Windows host the following script makes an unattended install of sal
|
|||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
"PowerShell (New-Object System.Net.WebClient).DownloadFile('http://csa-net.dk/salt/bootstrap64.bat','C:\bootstrap.bat');(New-Object -com Shell.Application).ShellExecute('C:\bootstrap.bat');"
|
# (All in one line.)
|
||||||
|
|
||||||
(All in one line.)
|
"PowerShell (New-Object System.Net.WebClient).DownloadFile('http://csa-net.dk/salt/bootstrap64.bat','C:\bootstrap.bat');(New-Object -com Shell.Application).ShellExecute('C:\bootstrap.bat');"
|
||||||
|
|
||||||
You can execute the above command remotely from a Linux host using winexe:
|
You can execute the above command remotely from a Linux host using winexe:
|
||||||
|
|
||||||
@ -307,7 +315,9 @@ For more info check `http://csa-net.dk/salt`_
|
|||||||
Packages management under Windows 2003
|
Packages management under Windows 2003
|
||||||
======================================
|
======================================
|
||||||
|
|
||||||
On windows Server 2003, you need to install optional component "wmi windows installer provider" to have full list of installed packages. If you don't have this, salt-minion can't report some installed softwares.
|
On windows Server 2003, you need to install optional component "wmi windows
|
||||||
|
installer provider" to have full list of installed packages. If you don't have
|
||||||
|
this, salt-minion can't report some installed softwares.
|
||||||
|
|
||||||
|
|
||||||
.. _http://csa-net.dk/salt: http://csa-net.dk/salt
|
.. _http://csa-net.dk/salt: http://csa-net.dk/salt
|
||||||
|
Loading…
Reference in New Issue
Block a user