From 01c64d2de838f02fa8ed10359e821d75a4e89e9a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 26 Oct 2014 18:54:12 +0000 Subject: [PATCH 1/8] Install python2-systemd on Arch git installs --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 2d6848c..7925091 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3377,7 +3377,7 @@ install_arch_linux_git_deps() { pacman -R --noconfirm --needed 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 || return 1 + python2-pyzmq zeromq python2-requests python2-systemd || return 1 __git_clone_and_checkout || return 1 From 62957f7ee5f68ed4d21c53d3b165740261138cb2 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Oct 2014 01:31:46 +0000 Subject: [PATCH 2/8] Install systemd-python in Fedora git installs --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7925091..1ada847 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2429,7 +2429,7 @@ install_fedora_stable_post() { install_fedora_git_deps() { install_fedora_deps || return 1 - yum install -y git || return 1 + yum install -y git systemd-python || return 1 __git_clone_and_checkout || return 1 From 2a26c48053e893b8ac4f3de62cf4406b79320718 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Oct 2014 01:32:56 +0000 Subject: [PATCH 3/8] Update changes log --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e9a5e62..68baa93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Version 2014.10.21: Howard Mei(HowardMei). * Allow installing ZMQ for SaltStack's COPR repository. * Allow installing ZMQ4/PyZMQ14 from Chris Lea's PPA repository. + * Install the python systemd bindings for Arch and Fedora git installations Version 2014.10.14: * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag From b31374a0f0ae08b89fb62e68c866321faffd7379 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Oct 2014 01:40:17 +0000 Subject: [PATCH 4/8] It should be a new change log section --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 68baa93..cf4257b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Version 2014.xx.xx: + * Install the python systemd bindings for Arch and Fedora git installations + Version 2014.10.21: * Fix path to python on FreeBSD. Thanks Pavel Snagovsky(paha) * Fix syndic installation on RHEL based installations. Thanks markgaylard @@ -5,7 +8,6 @@ Version 2014.10.21: Howard Mei(HowardMei). * Allow installing ZMQ for SaltStack's COPR repository. * Allow installing ZMQ4/PyZMQ14 from Chris Lea's PPA repository. - * Install the python systemd bindings for Arch and Fedora git installations Version 2014.10.14: * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag From dc90ef249c2ac549e258a07a3e86e1c65c2f10ea Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Oct 2014 01:54:56 +0000 Subject: [PATCH 5/8] Allow cloning from Salt's git repository using HTTPS. Fixes #475. The reason why HTTPS is not the preferred protocol is because not all systems(specially the older ones) know anything about GitHub's certificates. --- bootstrap-salt.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 1ada847..7c38971 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -243,6 +243,7 @@ usage() { -D Show debug output. -c Temporary configuration directory -g Salt repository URL. (default: git://github.com/saltstack/salt.git) + -G Insteady of cloning from git://github.com/saltstack/salt.git, clone from https://github.com/saltstack/salt.git (Usually necessary on systems which have the regular git protocol port blocked, where https usualy is not) -k Temporary directory holding the minion keys which will pre-seed the master. -s Sleep time used when waiting for daemons to start, restart and when checking @@ -278,7 +279,7 @@ EOT } # ---------- end of function usage ---------- -while getopts ":hvnDc:g:k:MSNXCPFUKIA:i:Lp:H:Z" opt +while getopts ":hvnDc:Gg:k:MSNXCPFUKIA:i:Lp:H:Z" opt do case "${opt}" in @@ -299,6 +300,8 @@ do fi ;; g ) _SALT_REPO_URL=$OPTARG ;; + G ) _SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git" + ;; k ) _TEMP_KEYS_DIR="$OPTARG" # If the configuration directory does not exist, error out if [ ! -d "$_TEMP_KEYS_DIR" ]; then @@ -1130,7 +1133,7 @@ __git_clone_and_checkout() { local __SALT_GIT_CHECKOUT_PARENT_DIR=$(dirname "${__SALT_GIT_CHECKOUT_DIR}" 2>/dev/null) __SALT_GIT_CHECKOUT_PARENT_DIR="${__SALT_GIT_CHECKOUT_PARENT_DIR:-/tmp/git}" local __SALT_CHECKOUT_REPONAME="$(basename "${__SALT_GIT_CHECKOUT_DIR}" 2>/dev/null)" - __SALT_CHECKOUT_REPONAME="${__SALT_CHECKOUT_REPONAME:-salt}" + __SALT_CHECKOUT_REPONAME="${__SALT_CHECKOUT_REPONAME:-salt}" [ -d "${__SALT_GIT_CHECKOUT_PARENT_DIR}" ] || mkdir "${__SALT_GIT_CHECKOUT_PARENT_DIR}" cd "${__SALT_GIT_CHECKOUT_PARENT_DIR}" if [ -d "${__SALT_GIT_CHECKOUT_DIR}" ]; then From 0084675e195ee2066cf46772b19db6feca1aa028 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Oct 2014 01:57:40 +0000 Subject: [PATCH 6/8] Update changes log --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index cf4257b..9b9f17b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Version 2014.xx.xx: * Install the python systemd bindings for Arch and Fedora git installations + * Allow cloning from Salt's git repository using HTTPS. #475 Version 2014.10.21: * Fix path to python on FreeBSD. Thanks Pavel Snagovsky(paha) From 79e9c7e7fb60a42e6a679715150cfa28127a6b9e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Oct 2014 02:04:26 +0000 Subject: [PATCH 7/8] Bump version for stable release. --- ChangeLog | 2 +- bootstrap-salt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b9f17b..4417489 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Version 2014.xx.xx: +Version 2014.10.28: * Install the python systemd bindings for Arch and Fedora git installations * Allow cloning from Salt's git repository using HTTPS. #475 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7c38971..6c746d5 100755 --- a/bootstrap-salt.sh +++ b/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.10.21" +__ScriptVersion="2014.10.28" __ScriptName="bootstrap-salt.sh" #====================================================================================================================== From 68329b80c86c731b46af740566daf2d7f8a2fd46 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Oct 2014 02:04:53 +0000 Subject: [PATCH 8/8] If using the default git clone URL, also update it to use HTTPS if the flag is passed. --- bootstrap-salt.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 6c746d5..8d57ef9 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -300,7 +300,12 @@ do fi ;; g ) _SALT_REPO_URL=$OPTARG ;; - G ) _SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git" + G ) if [ "${_SALT_REPO_URL}" = "${_SALTSTACK_REPO_URL}" ]; then + _SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git" + _SALT_REPO_URL=${_SALTSTACK_REPO_URL} + else + _SALTSTACK_REPO_URL="https://github.com/saltstack/salt.git" + fi ;; k ) _TEMP_KEYS_DIR="$OPTARG" # If the configuration directory does not exist, error out