Merge pull request #530 from rallytime/merge_develop

Merge develop into stable

Author: s0undt3ch

AUTHORS.rst

@@ -42,12 +42,14 @@ Matthew Mead-Briggs         mattmb
 Matthew Willson             ixela
 Matthieu Guegan             mguegan
 Mike Carlson                m87carlson             [email protected]
+Mike Place                  cachedout              [email protected]
 nevins-b                    nevins-b
 Niels Abspoel               aboe76
 Paul Brian                  lifeisstillgood        [email protected]
 Pavel Snagovsky             paha
 Pedro Algarvio              s0undt3ch              [email protected]
 Pedro Paulo                 pedropaulovc
+ptonelli                    ptonelli
 Raymond Barbiero            visualphoenix
 Roberto Aguilar             rca                    [email protected]
 Skyler Berg                 skylerberg             [email protected]

ChangeLog

@@ -1,3 +1,9 @@
+Version 2015.01.12:
+	* Add package upgrades support to FreeBSD. Thanks William Eshagh(eshagl).
+	* Make sure wget is installed on debian bare systems.
+	* Make sure the Arch pacman database is up to date
+	* Install `python-hashlib` in CentOS 5 in order to use the COPR repository
+
 Version 2014.12.11:
 	* Enable binary installations on CentOS 7. Thanks ggillies
 	* Updated the URL for EPEL 7

README.rst

@@ -11,7 +11,7 @@ install the `Salt`_ binaries using the appropriate methods.
 
 .. Note::
 
-  This ``README`` file is not the absolute truth to what the bootstrap script is capable to do, for 
+  This ``README`` file is not the absolute truth to what the bootstrap script is capable of, for 
   that, please read the generated help by passing ``-h`` to the script or even better, `read the 
   source`_.
 
@@ -86,6 +86,24 @@ have ``fetch`` available though:
   fetch -o install_salt.sh https://bootstrap.saltstack.com
   sudo sh install_salt.sh
 
+If you have any SSL issues install ``ca_root_nssp``:
+
+..code:: console
+
+   pkg install ca_root_nssp
+
+And either copy the certificates to the place where fetch can find them:
+
+..code:: console
+
+   cp /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem
+
+Or link them to the right place:
+
+..code:: console
+
+   ln -s /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem
+
 
 If all you want is to install a ``salt-master`` using latest git:
 

bootstrap-salt.sh

@@ -17,7 +17,7 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
-__ScriptVersion="2014.12.11"
+__ScriptVersion="2015.01.12"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================
@@ -1993,6 +1993,9 @@ install_debian_6_deps() {
 
     apt-get update
 
+    # Make sure wget is available
+    __apt_get_install_noinput wget
+
     # Install Keys
     __apt_get_install_noinput debian-archive-keyring && apt-get update
 
@@ -2090,6 +2093,10 @@ install_debian_7_deps() {
     export DEBIAN_FRONTEND=noninteractive
 
     apt-get update
+
+    # Make sure wget is available
+    __apt_get_install_noinput wget
+
     # Install Keys
     __apt_get_install_noinput debian-archive-keyring && apt-get update
 
@@ -2577,6 +2584,7 @@ install_centos_stable_deps() {
     __install_epel_repository || return 1
 
     if [ "$_ENABLE_EXTERNAL_ZMQ_REPOS" -eq $BS_TRUE ]; then
+        yum -y install python-hashlib || return 1
         __install_saltstack_copr_zeromq_repository || return 1
     fi
 
@@ -2729,15 +2737,18 @@ install_centos_git_post() {
         [ $fname = "api" ] && ([ "$_INSTALL_MASTER" -eq $BS_FALSE ] || [ "$(which salt-${fname} 2>/dev/null)" = "" ]) && continue
         [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
-        if [ ! -f /usr/lib/systemd/system/salt-${fname}.service ] || ([ -f /usr/lib/systemd/system/salt-${fname}.service ] && [ $_FORCE_OVERWRITE -eq $BS_TRUE ]); then
-            copyfile "${__SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" /usr/lib/systemd/system/
+        if [ -f /bin/systemctl ]; then
+            if [ ! -f /usr/lib/systemd/system/salt-${fname}.service ] || ([ -f /usr/lib/systemd/system/salt-${fname}.service ] && [ $_FORCE_OVERWRITE -eq $BS_TRUE ]); then
+                copyfile "${__SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" /usr/lib/systemd/system/
+            fi
 
             # Skip salt-api since the service should be opt-in and not necessarily started on boot
             [ $fname = "api" ] && continue
 
             /bin/systemctl enable salt-${fname}.service
             SYSTEMD_RELOAD=$BS_TRUE
-        elif [ ! -f /usr/lib/systemd/system/salt-${fname}.service ] && [ ! -f /etc/init.d/salt-$fname ] || ([ -f /etc/init.d/salt-$fname ] && [ $_FORCE_OVERWRITE -eq $BS_TRUE ]); then
+
+        elif [ ! -f /etc/init.d/salt-$fname ] || ([ -f /etc/init.d/salt-$fname ] && [ $_FORCE_OVERWRITE -eq $BS_TRUE ]); then
             copyfile "${__SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}" /etc/init.d/
             chmod +x /etc/init.d/salt-${fname}
 
@@ -3373,6 +3384,12 @@ install_arch_linux_stable_deps() {
         pacman-key --init && pacman-key --populate archlinux || return 1
     fi
 
+    pacman -Sy --noconfirm --needed pacman || return 1
+
+    if [ "$(which pacman-db-upgrade)" != "" ]; then
+        pacman-db-upgrade || return 1
+    fi
+
     if [ "$_UPGRADE_SYS" -eq $BS_TRUE ]; then
         pacman -Syyu --noconfirm --needed || return 1
     fi
@@ -3392,9 +3409,8 @@ install_arch_linux_stable_deps() {
 install_arch_linux_git_deps() {
     install_arch_linux_stable_deps
 
-    pacman -Sy --noconfirm --needed pacman || return 1
     # Don't fail if un-installing python2-distribute threw an error
-    pacman -R --noconfirm --needed python2-distribute
+    pacman -R --noconfirm python2-distribute
     pacman -Sy --noconfirm --needed git python2-crypto python2-setuptools python2-jinja \
         python2-m2crypto python2-markupsafe python2-msgpack python2-psutil python2-yaml \
         python2-pyzmq zeromq python2-requests python2-systemd || return 1
@@ -3623,6 +3639,10 @@ install_freebsd_9_stable_deps() {
         /usr/local/sbin/pkg install ${SALT_PKG_FLAGS} -y ${_EXTRA_PACKAGES} || return 1
     fi
 
+    if [ "$_UPGRADE_SYS" -eq $BS_TRUE ]; then
+        pkg upgrade -y || return 1
+    fi
+
     return 0
 }