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

Merge pull request #291 from s0undt3ch/develop

Browse source 
Initial FreeBSD 10 support + More
This commit is contained in:
Pedro Algarvio 2014-01-30 19:25:53 -08:00
commit 6b80d2710a
3 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,11 @@
Version 1.5.12:
* Distro Support Fixed:
* FreeBSD `fetch` now has a notion of insecure certificates. Handle this properly. Thank
You Mike Carlson(m87carlson).
Version 1.5.11:
* Fixed an out of scope variable missed when moving functions around.
Version 1.5.10:
* Salt no longer has the master branch in git, install from develop as default.
* Installing from Git on Red Hat based distributions now also needs `yum-utils` installed.
@ -9,7 +17,6 @@ Version 1.5.10:
* Minimal Ubuntu installation might not have upstart installed, fixed.
* FreeBSD now uses the official FreeBSD repository. Thank You Paul Brian(lifeisstillgood)!
Version 1.5.9:
* Allow to not start the daemons after bootstrapping salt. This will allow `vagrant-lxc`
installations, `debootstrap*`, etc, to finish properly. Thanks Henrik Holmboe (holmboe).

21
README.rst
View file

@ -19,7 +19,18 @@ One Line Bootstrap
If you're looking for the *one-liner* to install salt(please remove ``sudo`` from the following
*one-liners* if running them as the ``root`` user).
For example, using ``curl`` to install latest git:
.. Attention:: The following examples are provided as an helpful and short way to install Salt.
The URL used is just an HTTP redirect and as such it **will**, most likely, make either ``curl`` or
``wget`` or ``fetch`` (in FreeBSD >= 10), to complain about certificate issues. If this worries
you, you **should not** use this URL. Use instead::
https://github.com/saltstack/salt-bootstrap/raw/develop/bootstrap-salt.sh
Examples
~~~~~~~~
Using ``curl`` to install latest git:
.. code:: console
@ -79,6 +90,12 @@ have ``fetch`` available though:
fetch -o - http://bootstrap.saltstack.org | sudo sh
For FreeBSD >= 10 you might need to make fetch ignore the certificate issue:
.. code:: console
fetch --no-verify-peer -o - http://bootstrap.saltstack.org | sudo sh
If all you want is to install a ``salt-master`` using latest git:
@ -178,7 +195,7 @@ In order to install salt for a distribution you need to define:
----
Below is an example for Ubuntu Oneiric:
Below is an example for Ubuntu Oneiric(the example may not be up to date with the script):
.. code:: bash

12
bootstrap-salt.sh
View file

@ -17,7 +17,7 @@
# CREATED: 10/15/2012 09:49:37 PM WEST
#===============================================================================
set -o nounset # Treat unset variables as an error
__ScriptVersion="1.5.11"
__ScriptVersion="1.5.12"
__ScriptName="bootstrap-salt.sh"
#===============================================================================
@ -241,6 +241,7 @@ _UPGRADE_SYS=${BS_UPGRADE_SYS:-$BS_FALSE}
_INSECURE_DL=${BS_INSECURE_DL:-$BS_FALSE}
_WGET_ARGS=${BS_WGET_ARGS:-}
_CURL_ARGS=${BS_CURL_ARGS:-}
_FETCH_ARGS=${BS_FETCH_ARGS:-}
# __SIMPLIFY_VERSION is mostly used in Solaris based distributions
__SIMPLIFY_VERSION=$BS_TRUE
@ -467,6 +468,7 @@ exec 2>$LOGPIPE
if [ $_INSECURE_DL -eq $BS_TRUE ]; then
_CURL_ARGS="${_CURL_ARGS} --insecure"
_WGET_ARGS="${_WGET_ARGS} --no-check-certificate"
_FETCH_ARGS="${_FETCH_ARGS} --no-verify-peer"
fi
#=== FUNCTION ================================================================
@ -476,7 +478,9 @@ fi
__fetch_url() {
curl $_CURL_ARGS -s -o "$1" "$2" >/dev/null 2>&1 ||
wget $_WGET_ARGS -q -O "$1" "$2" >/dev/null 2>&1 ||
fetch -q -o "$1" "$2" >/dev/null 2>&1
fetch $_FETCH_ARGS -q -o "$1" "$2" >/dev/null 2>&1 ||
fetch -q -o "$1" "$2" >/dev/null 2>&1 # Pre FreeBSD 10
}
@ -2139,7 +2143,7 @@ install_red_hat_enterprise_server_testing_post() {
# Amazon Linux AMI Install Functions
#
install_amazon_linux_ami_deps() {
# Acording to http://aws.amazon.com/amazon-linux-ami/faqs/#epel we should
# According to http://aws.amazon.com/amazon-linux-ami/faqs/#epel we should
# enable the EPEL 6 repo
if [ $CPU_ARCH_L = "i686" ]; then
EPEL_ARCH="i386"
@ -2379,7 +2383,7 @@ __freebsd_get_packagesite() {
set -o nounset
}
# Using a seperate conf step to head for idempotent install...
# Using a separate conf step to head for idempotent install...
__configure_freebsd_pkg_details() {
## pkg.conf is deprecated.