valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12332 from s0undt3ch/hotfix/jenkins

Browse Source 
Revert "Default to https instead of http"
This commit is contained in:
Pedro Algarvio 2014-04-27 11:47:33 +01:00
commit b288ccdbb0
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/conf.py
View File

@ -253,7 +253,7 @@ linkcheck_ignore = [r'http://127.0.0.1',
r'https://github.com/watching',
r'dash-feed://',
r'https://github.com/saltstack/salt/',
r'https://bootstrap.saltstack.org',
r'http://bootstrap.saltstack.org',
r'media.readthedocs.org/dash/salt/latest/salt.xml',
r'https://portal.aws.amazon.com/gp/aws/securityCredentials',
r'https://help.github.com/articles/fork-a-repo',

22
doc/man/salt.7
View File

@ -304,7 +304,7 @@ the bootstrap script:
.sp
.nf
.ft C
wget \-O \- https://bootstrap.saltstack.org | sudo sh
wget \-O \- http://bootstrap.saltstack.org | sudo sh
.ft P
.fi
.UNINDENT
@ -316,7 +316,7 @@ Run the following script to install just the Salt Master:
.sp
.nf
.ft C
curl \-L https://bootstrap.saltstack.org | sudo sh \-s \-\- \-M \-N
curl \-L http://bootstrap.saltstack.org | sudo sh \-s \-\- \-M \-N
.ft P
.fi
.UNINDENT
@ -5931,7 +5931,7 @@ this incredibly easy for any OS with a Bourne shell. You can use it like this:
.sp
.nf
.ft C
wget \-O \- https://bootstrap.saltstack.org | sudo sh
wget \-O \- http://bootstrap.saltstack.org | sudo sh
.ft P
.fi
.UNINDENT
@ -6066,7 +6066,7 @@ For example, using \fBcurl\fP to install latest git:
.sp
.nf
.ft C
curl \-L https://bootstrap.saltstack.org | sudo sh \-s \-\- git develop
curl \-L http://bootstrap.saltstack.org | sudo sh \-s \-\- git develop
.ft P
.fi
.UNINDENT
@ -6078,7 +6078,7 @@ If you have certificate issues using \fBcurl\fP, try the following:
.sp
.nf
.ft C
curl \-\-insecure \-L https://bootstrap.saltstack.org | sudo sh \-s \-\- git develop
curl \-\-insecure \-L http://bootstrap.saltstack.org | sudo sh \-s \-\- git develop
.ft P
.fi
.UNINDENT
@ -6090,7 +6090,7 @@ Using \fBwget\fP to install your distribution\(aqs stable packages:
.sp
.nf
.ft C
wget \-O \- https://bootstrap.saltstack.org | sudo sh
wget \-O \- http://bootstrap.saltstack.org | sudo sh
.ft P
.fi
.UNINDENT
@ -6102,7 +6102,7 @@ If you have certificate issues using \fBwget\fP try the following:
.sp
.nf
.ft C
wget \-\-no\-check\-certificate \-O \- https://bootstrap.saltstack.org | sudo sh
wget \-\-no\-check\-certificate \-O \- http://bootstrap.saltstack.org | sudo sh
.ft P
.fi
.UNINDENT
@ -6114,7 +6114,7 @@ Install a specific version from git using \fBwget\fP:
.sp
.nf
.ft C
wget \-O \- https://bootstrap.saltstack.org | sh \-s \-\- \-P git v0.16.4
wget \-O \- http://bootstrap.saltstack.org | sh \-s \-\- \-P git v0.16.4
.ft P
.fi
.UNINDENT
@ -6152,7 +6152,7 @@ have \fBfetch\fP available though:
.sp
.nf
.ft C
fetch \-o \- https://bootstrap.saltstack.org | sudo sh
fetch \-o \- http://bootstrap.saltstack.org | sudo sh
.ft P
.fi
.UNINDENT
@ -6164,7 +6164,7 @@ If all you want is to install a \fBsalt\-master\fP using latest git:
.sp
.nf
.ft C
curl \-L https://bootstrap.saltstack.org | sudo sh \-s \-\- \-M \-N git develop
curl \-L http://bootstrap.saltstack.org | sudo sh \-s \-\- \-M \-N git develop
.ft P
.fi
.UNINDENT
@ -6176,7 +6176,7 @@ If you want to install a specific release version (based on the git tags):
.sp
.nf
.ft C
curl \-L https://bootstrap.saltstack.org | sudo sh \-s \-\- git v0.16.4
curl \-L http://bootstrap.saltstack.org | sudo sh \-s \-\- git v0.16.4
.ft P
.fi
.UNINDENT

2
doc/topics/tutorials/quickstart.rst
View File

@ -26,7 +26,7 @@ for any OS with a Bourne shell:
.. code-block:: bash
wget -O - https://bootstrap.saltstack.org | sudo sh
wget -O - http://bootstrap.saltstack.org | sudo sh
See the `salt-bootstrap`_ documentation for other one liners. When using `Vagrant`_
to test out salt, the `salty-vagrant`_ tool will provision the VM for you.

20
doc/topics/tutorials/salt_bootstrap.rst
View File

@ -49,42 +49,42 @@ For example, using ``curl`` to install your distribution's stable packages:
.. code-block:: bash
curl -L https://bootstrap.saltstack.org | sudo sh
curl -L http://bootstrap.saltstack.org | sudo sh
Using ``wget`` to install your distribution's stable packages:
.. code-block:: bash
wget -O - https://bootstrap.saltstack.org | sudo sh
wget -O - http://bootstrap.saltstack.org | sudo sh
Installing the latest version available from git with ``curl``:
.. code-block:: bash
curl -L https://bootstrap.saltstack.org | sudo sh -s -- git develop
curl -L http://bootstrap.saltstack.org | sudo sh -s -- git develop
If you have certificate issues using ``curl``, try the following:
.. code-block:: bash
curl --insecure -L https://bootstrap.saltstack.org | sudo sh -s -- git develop
curl --insecure -L http://bootstrap.saltstack.org | sudo sh -s -- git develop
If you have certificate issues using ``wget`` try the following:
.. code-block:: bash
wget --no-check-certificate -O - https://bootstrap.saltstack.org | sudo sh
wget --no-check-certificate -O - http://bootstrap.saltstack.org | sudo sh
Install a specific version from git using ``wget``:
.. code-block:: bash
wget -O - https://bootstrap.saltstack.org | sh -s -- -P git v0.16.4
wget -O - http://bootstrap.saltstack.org | sh -s -- -P git v0.16.4
If you already have python installed, ``python 2.6``, then it's as easy as:
@ -107,21 +107,21 @@ available. You **do** have ``fetch`` available though:
.. code-block:: bash
fetch -o - https://bootstrap.saltstack.org | sudo sh
fetch -o - http://bootstrap.saltstack.org | sudo sh
If all you want is to install a ``salt-master`` using latest git:
.. code-block:: bash
curl -L https://bootstrap.saltstack.org | sudo sh -s -- -M -N git develop
curl -L http://bootstrap.saltstack.org | sudo sh -s -- -M -N git develop
If you want to install a specific release version (based on the git tags):
.. code-block:: bash
curl -L https://bootstrap.saltstack.org | sudo sh -s -- git v0.16.4
curl -L http://bootstrap.saltstack.org | sudo sh -s -- git v0.16.4
Downloading the develop branch (from here standard command line options may be
@ -135,7 +135,7 @@ Command Line Options
--------------------
Here's a summary of the command line options (and how check them against
``https://bootstrap.saltstack.org``)::
``http://bootstrap.saltstack.org``)::
$ sh bootstrap-salt.sh -h

4
salt/cloud/deploy/curl-bootstrap-git.sh
View File

@ -7,11 +7,11 @@
#
# It has been designed as an example, to be customized for your own needs.
curl -L https://bootstrap.saltstack.org | sudo sh -s -- "$@" git develop
curl -L http://bootstrap.saltstack.org | sudo sh -s -- "$@" git develop
# By default, Salt Cloud now places the minion's keys and configuration in
# /tmp/.saltcloud/ before executing the deploy script. After it has executed,
# these temporary files are removed. If you don't want salt-bootstrap to handle
# these files, comment out the above command, and uncomment the below command.
#curl -L https://bootstrap.saltstack.org | sudo sh -s git develop
#curl -L http://bootstrap.saltstack.org | sudo sh -s git develop

4
salt/cloud/deploy/curl-bootstrap.sh
View File

@ -7,11 +7,11 @@
#
# It has been designed as an example, to be customized for your own needs.
curl -L https://bootstrap.saltstack.org | sudo sh -s -- "$@"
curl -L http://bootstrap.saltstack.org | sudo sh -s -- "$@"
# By default, Salt Cloud now places the minion's keys and configuration in
# /tmp/.saltcloud/ before executing the deploy script. After it has executed,
# these temporary files are removed. If you don't want salt-bootstrap to handle
# these files, comment out the above command, and uncomment the below command.
#curl -L https://bootstrap.saltstack.org | sudo sh
#curl -L http://bootstrap.saltstack.org | sudo sh

4
salt/cloud/deploy/wget-bootstrap-nocert.sh
View File

@ -7,11 +7,11 @@
#
# It has been designed as an example, to be customized for your own needs.
wget --no-check-certificate -O - https://bootstrap.saltstack.org | sudo sh -s -- "$@"
wget --no-check-certificate -O - http://bootstrap.saltstack.org | sudo sh -s -- "$@"
# By default, Salt Cloud now places the minion's keys and configuration in
# /tmp/.saltcloud/ before executing the deploy script. After it has executed,
# these temporary files are removed. If you don't want salt-bootstrap to handle
# these files, comment out the above command, and uncomment the below command.
#wget --no-check-certificate -O - https://bootstrap.saltstack.org | sudo sh
#wget --no-check-certificate -O - http://bootstrap.saltstack.org | sudo sh

4
salt/cloud/deploy/wget-bootstrap.sh
View File

@ -7,11 +7,11 @@
#
# It has been designed as an example, to be customized for your own needs.
wget -O - https://bootstrap.saltstack.org | sudo sh -s -- "$@"
wget -O - http://bootstrap.saltstack.org | sudo sh -s -- "$@"
# By default, Salt Cloud now places the minion's keys and configuration in
# /tmp/.saltcloud/ before executing the deploy script. After it has executed,
# these temporary files are removed. If you don't want salt-bootstrap to handle
# these files, comment out the above command, and uncomment the below command.
#wget -O - https://bootstrap.saltstack.org | sudo sh
#wget -O - http://bootstrap.saltstack.org | sudo sh