From 7396f21c08b3c9695d342620fb15b7b76d592092 Mon Sep 17 00:00:00 2001 From: Barracuda Team Date: Sat, 26 Apr 2014 15:22:43 +0200 Subject: [PATCH] Issue #2250397 by AntiNSA - Always follow (limited) redirects in cURL requests. This is to avoid issues caused by sites, like GitHub, changing their URLs for downloads. --- BARRACUDA.sh.txt | 40 +++++++++--------- BOA.sh.txt | 18 ++++---- CHANGELOG.txt | 1 + OCTOPUS.sh.txt | 2 +- aegir/scripts/AegirSetupA.sh.txt | 6 +-- aegir/scripts/AegirSetupB.sh.txt | 6 +-- aegir/scripts/AegirSetupC.sh.txt | 68 +++++++++++++++---------------- aegir/scripts/AegirSetupM.sh.txt | 4 +- aegir/scripts/AegirUpgrade.sh.txt | 4 +- aegir/tools/BOND.sh.txt | 8 ++-- aegir/tools/bin/barracuda | 22 +++++----- aegir/tools/bin/boa | 30 +++++++------- aegir/tools/bin/octopus | 14 +++---- aegir/tools/system/daily.sh | 6 +-- 14 files changed, 115 insertions(+), 114 deletions(-) diff --git a/BARRACUDA.sh.txt b/BARRACUDA.sh.txt index 788738666..ecf3768b8 100755 --- a/BARRACUDA.sh.txt +++ b/BARRACUDA.sh.txt @@ -1305,7 +1305,7 @@ extract_archive () { # Download and extract archive from dev mirror. get_dev_arch () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$1" extract_archive "$1" fi } @@ -1313,7 +1313,7 @@ get_dev_arch () { # Download and extract from dev/version mirror. get_dev_ext () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" extract_archive "$1" fi } @@ -1321,7 +1321,7 @@ get_dev_ext () { # Download and extract from dev/contrib mirror. get_dev_contrib () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/contrib/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/contrib/$1" extract_archive "$1" fi } @@ -1329,7 +1329,7 @@ get_dev_contrib () { # Download and extract archive from dev/src mirror. get_dev_src () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/src/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/src/$1" extract_archive "$1" fi } @@ -2491,11 +2491,11 @@ tune_sql_memory_limits () { msg "INFO: Running MySQLTuner check on all databases..." msg "NOTE! This step may take a LONG time, please wait..." rm -f /var/opt/mysqltuner* - ### curl -s --retry 10 --retry-delay 15 -A iCab "https://raw.github.com/major/MySQLTuner-perl/master/mysqltuner.pl" -o /var/opt/mysqltuner.pl - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/mysqltuner.pl" -o /var/opt/mysqltuner.pl + ### curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "https://raw.githubusercontent.com/major/MySQLTuner-perl/master/mysqltuner.pl" -o /var/opt/mysqltuner.pl + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/mysqltuner.pl" -o /var/opt/mysqltuner.pl if [ ! -e "/var/opt/mysqltuner.pl" ] ; then mrun "sleep 60" - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/mysqltuner.pl" -o /var/opt/mysqltuner.pl + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/mysqltuner.pl" -o /var/opt/mysqltuner.pl fi if [ -e "/var/opt/mysqltuner.pl" ] ; then perl /var/opt/mysqltuner.pl > /var/opt/mysqltuner-$_INSTALLER_VERSION-$_NOW.txt 2>&1 @@ -4135,7 +4135,7 @@ upgrade_aegir_master () { if [ ! -d "/var/aegir/.drush/provision/http" ] ; then cd /var/aegir/.drush rm -f -r /var/aegir/.drush/{provision,drush_make} - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - get_dev_ext "drush_make.tar.gz" &> /dev/null rm -f -r /var/aegir/drush cd /var/aegir @@ -4722,8 +4722,8 @@ update_sources_list () { msg "INFO: Now looking for the best/fastest $_THIS_OS mirror, this may take a while, please wait..." mkdir -p /opt/tmp/helpers cd /opt/tmp/helpers - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/helpers/ffmirror.sh.txt" -o ffmirror.sh.txt - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/helpers/apt-list-ubuntu.txt" -o apt-list-ubuntu.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/helpers/ffmirror.sh.txt" -o ffmirror.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/helpers/apt-list-ubuntu.txt" -o apt-list-ubuntu.txt _MIRROR=`bash ffmirror.sh.txt < apt-list-ubuntu.txt` _MIRROR=`bash ffmirror.sh.txt < apt-list-ubuntu.txt` echo " " @@ -4758,7 +4758,7 @@ update_sources_list () { if [ -e "/opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-ubuntu.txt" ] ; then cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-ubuntu.txt /etc/apt/preferences else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-ubuntu.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-ubuntu.txt" -o /etc/apt/preferences fi elif [ "$_THIS_OS" = "Debian" ] ; then _MIRROR_CHECK=NO @@ -4780,8 +4780,8 @@ update_sources_list () { msg "INFO: Now looking for the best/fastest $_THIS_OS mirror, this may take a while, please wait..." mkdir -p /opt/tmp/helpers cd /opt/tmp/helpers - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/helpers/ffmirror.sh.txt" -o ffmirror.sh.txt - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/helpers/apt-list-debian.txt" -o apt-list-debian.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/helpers/ffmirror.sh.txt" -o ffmirror.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/helpers/apt-list-debian.txt" -o apt-list-debian.txt _MIRROR=`bash ffmirror.sh.txt < apt-list-debian.txt` _MIRROR=`bash ffmirror.sh.txt < apt-list-debian.txt` echo " " @@ -4817,14 +4817,14 @@ update_sources_list () { if [ -e "/opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-wheezy.txt" ] ; then cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-wheezy.txt /etc/apt/preferences else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-wheezy.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-wheezy.txt" -o /etc/apt/preferences fi fi if [ "$_REL_VERSION" = "squeeze" ] ; then if [ -e "/opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-squeeze.txt" ] ; then cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-squeeze.txt /etc/apt/preferences else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-squeeze.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-squeeze.txt" -o /etc/apt/preferences fi fi fi @@ -4838,20 +4838,20 @@ update_sources_list () { if [ -e "/opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-ubuntu.txt" ] ; then cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-ubuntu.txt /etc/apt/preferences else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-ubuntu.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-ubuntu.txt" -o /etc/apt/preferences fi else if [ "$_REL_VERSION" = "wheezy" ] ; then if [ -e "/opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-wheezy.txt" ] ; then cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-wheezy.txt /etc/apt/preferences else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-wheezy.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-wheezy.txt" -o /etc/apt/preferences fi else if [ -e "/opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-squeeze.txt" ] ; then cp -af /opt/tmp/$_BOA_REPO_NAME/aegir/conf/etc-apt-preferences-squeeze.txt /etc/apt/preferences else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-squeeze.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-squeeze.txt" -o /etc/apt/preferences fi fi fi @@ -5755,7 +5755,7 @@ if [ "$_AEGIR_VERSION" = "HEAD" ] ; then fi fi else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/boa-$_INSTALLER_VERSION.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/boa-$_INSTALLER_VERSION.tar.gz" | tar -xzf - _BOA_REPO_NAME="boa" fi # @@ -8975,7 +8975,7 @@ csf_install () { if ! netcat -w 8 -z www.configserver.com 80 ; then get_dev_arch "csf.tgz" &> /dev/null else - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://www.configserver.com/free/csf.tgz" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://www.configserver.com/free/csf.tgz" extract_archive "csf.tgz" fi cd csf diff --git a/BOA.sh.txt b/BOA.sh.txt index 1802c5abd..a850a443e 100644 --- a/BOA.sh.txt +++ b/BOA.sh.txt @@ -60,7 +60,7 @@ setup () echo "nameserver 8.8.4.4" >>/etc/resolv.conf fi fi - _CURL_TEST=$(curl -s -I "http://files.aegir.cc" 2> /dev/null) + _CURL_TEST=$(curl -L --max-redirs 10 -k -s -I "http://files.aegir.cc" 2> /dev/null) if [[ "$_CURL_TEST" =~ "200 OK" ]] ; then _DO_NOTHING=YES else @@ -80,14 +80,14 @@ setup () ln -sf /opt/local/bin/octopus /usr/local/bin/octopus fi rm -f /opt/local/bin/{barracuda*,boa*,drushextra*,octopus*,randpass*,sqlmagic*,syncpass*,thinkdifferent*} - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/barracuda" -o /opt/local/bin/barracuda - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/boa" -o /opt/local/bin/boa - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/drushextra" -o /opt/local/bin/drushextra - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/octopus" -o /opt/local/bin/octopus - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/randpass" -o /opt/local/bin/randpass - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/sqlmagic" -o /opt/local/bin/sqlmagic - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/syncpass" -o /opt/local/bin/syncpass - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/thinkdifferent" -o /opt/local/bin/thinkdifferent + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/barracuda" -o /opt/local/bin/barracuda + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/boa" -o /opt/local/bin/boa + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/drushextra" -o /opt/local/bin/drushextra + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/octopus" -o /opt/local/bin/octopus + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/randpass" -o /opt/local/bin/randpass + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/sqlmagic" -o /opt/local/bin/sqlmagic + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/syncpass" -o /opt/local/bin/syncpass + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/thinkdifferent" -o /opt/local/bin/thinkdifferent echo "### $_TODAY ###" >> /opt/local/bin/boa echo "### $_TODAY ###" >> /opt/local/bin/barracuda echo "### $_TODAY ###" >> /opt/local/bin/octopus diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d67720beb..a77bc30fc 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -77,6 +77,7 @@ * Force MariaDB 5.5 re-install if installed version doesn't match latest. * Issue #2238805 - Command filtering - no word containing *drush* is allowed. * Issue #2247997 - Update docs/REMOTE.txt with workaround for websh issue. + * Issue #2250397 - Always follow (limited) redirects in cURL requests. * Issue #GH-304 - [rvm] use $_RUBY_VERSION as default. * Issue #GH-305 - Check disk usage before running install/upgrade. * Nginx: Allow to configure keywords for aggressive requests rate monitoring. diff --git a/OCTOPUS.sh.txt b/OCTOPUS.sh.txt index 074645b51..ea95c8a34 100755 --- a/OCTOPUS.sh.txt +++ b/OCTOPUS.sh.txt @@ -1793,7 +1793,7 @@ if [ "$_AEGIR_VERSION" = "HEAD" ] ; then cd /opt/tmp fi else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/boa-$_INSTALLER_VERSION.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/boa-$_INSTALLER_VERSION.tar.gz" | tar -xzf - _BOA_REPO_NAME="boa" fi if [ ! -e "/opt/tmp/$_BOA_REPO_NAME/aegir/helpers/apt.conf.noninteractive" ] ; then diff --git a/aegir/scripts/AegirSetupA.sh.txt b/aegir/scripts/AegirSetupA.sh.txt index 7e84857f6..31a7a2c43 100644 --- a/aegir/scripts/AegirSetupA.sh.txt +++ b/aegir/scripts/AegirSetupA.sh.txt @@ -239,7 +239,7 @@ extract_archive () { # Download and extract from dev/contrib mirror. get_dev_contrib () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/contrib/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/contrib/$1" extract_archive "$1" fi } @@ -247,7 +247,7 @@ get_dev_contrib () { # Download and extract from dev. get_dev_ext () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" extract_archive "$1" fi } @@ -1007,7 +1007,7 @@ else if [ ! -d "$_ROOT/.drush/provision/http" ] ; then cd $_ROOT/.drush rm -f -r $_ROOT/.drush/{provision,drush_make} - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - get_dev_ext "drush_make.tar.gz" &> /dev/null cp -af /var/aegir/drush/includes/table.inc /data/disk/o1/tools/drush/includes/table.inc fi diff --git a/aegir/scripts/AegirSetupB.sh.txt b/aegir/scripts/AegirSetupB.sh.txt index b7a3a085d..dda3817e4 100644 --- a/aegir/scripts/AegirSetupB.sh.txt +++ b/aegir/scripts/AegirSetupB.sh.txt @@ -172,7 +172,7 @@ extract_archive () { # Download and extract from dev. get_dev_ext () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" extract_archive "$1" fi } @@ -180,7 +180,7 @@ get_dev_ext () { # Download and extract from dev/contrib mirror. get_dev_contrib () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/contrib/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/contrib/$1" extract_archive "$1" fi } @@ -418,7 +418,7 @@ if [ "$_AEGIR_VERSION" = "HEAD" ] ; then rm -f -r $_ROOT/.drush/*/.git get_dev_ext "clean_missing_modules.tar.gz" &> /dev/null else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - if [ "$_STATUS" = "UPGRADE" ] ; then get_dev_ext "drush_make.tar.gz" &> /dev/null fi diff --git a/aegir/scripts/AegirSetupC.sh.txt b/aegir/scripts/AegirSetupC.sh.txt index 6a14acee0..ebb7166ac 100644 --- a/aegir/scripts/AegirSetupC.sh.txt +++ b/aegir/scripts/AegirSetupC.sh.txt @@ -212,7 +212,7 @@ extract_archive () { # Download and extract from dev/contrib mirror. get_dev_contrib () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/contrib/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/contrib/$1" extract_archive "$1" fi } @@ -220,7 +220,7 @@ get_dev_contrib () { # Download and extract from distro. get_distro_ext () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/distro/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/distro/$1" extract_archive "$1" fi } @@ -350,7 +350,7 @@ prepare_drupal6_core () { if [ ! -e "$_D6_CORE_DIR" ] ; then rm -f -r $_D6_CORE_DIR cd /data/all/000/core - curl -s -A iCab "http://files.aegir.cc/core/pressflow-$_SMALLCORE6.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s -A iCab "http://files.aegir.cc/core/pressflow-$_SMALLCORE6.tar.gz" | tar -xzf - cd $_D6_CORE_DIR/ fix_dirs_files patch -p0 < /opt/tmp/$_BOA_REPO_NAME/aegir/patches/taxonomy-6.26.patch &> /dev/null @@ -375,7 +375,7 @@ prepare_drupal7_core () { if [ ! -e "$_D7_CORE_DIR" ] ; then rm -f -r $_D7_CORE_DIR cd /data/all/000/core - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/core/drupal-$_SMALLCORE7.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/core/drupal-$_SMALLCORE7.tar.gz" | tar -xzf - cd $_D7_CORE_DIR/ fix_dirs_files rename_drupal7_profiles @@ -397,7 +397,7 @@ prepare_drupal8_core () { if [ ! -e "$_D8_CORE_DIR" ] ; then rm -f -r $_D8_CORE_DIR cd /data/all/000/core - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/core/drupal-$_SMALLCORE8.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/core/drupal-$_SMALLCORE8.tar.gz" | tar -xzf - cd $_D8_CORE_DIR/ fix_dirs_files rename_drupal8_profiles @@ -513,7 +513,7 @@ upgrade_contrib_less () { if [ -e "views" ] ; then cd views # https://drupal.org/node/1766338#comment-6445882 - curl -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-revert-broken-filter-or-groups-1766338-7.patch + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-revert-broken-filter-or-groups-1766338-7.patch patch -p1 < views-revert-broken-filter-or-groups-1766338-7.patch &> /dev/null cd ../ fi @@ -813,7 +813,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_COD-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_COD-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_COD" ] ; then mv $_REAL_PRNAME-$_COD $_SHRD_PLNAME fi @@ -860,7 +860,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_COMMERCE1-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_COMMERCE1-core.tar.gz" | tar -xzf - if [ -d "$_CORE/commerce-$_COMMERCE1" ] ; then mv commerce-$_COMMERCE1 $_SHRD_PLNAME elif [ -d "$_CORE/$_REAL_PRNAME-$_COMMERCE1" ] ; then @@ -912,7 +912,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_COMMERCE2-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_COMMERCE2-core.tar.gz" | tar -xzf - if [ -d "$_CORE/commerce-$_COMMERCE2" ] ; then mv commerce-$_COMMERCE2 $_SHRD_PLNAME elif [ -d "$_CORE/$_REAL_PRNAME-$_COMMERCE2" ] ; then @@ -1027,7 +1027,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_COMMONS3-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_COMMONS3-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_COMMONS3" ] ; then mv $_REAL_PRNAME-$_COMMONS3 $_SHRD_PLNAME fi @@ -1341,7 +1341,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_GUARDR-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_GUARDR-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_GUARDR" ] ; then mv $_REAL_PRNAME-$_GUARDR $_SHRD_PLNAME fi @@ -1417,14 +1417,14 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then get_dev_contrib "views-6.x-2.13.tar.gz" cd views # https://drupal.org/node/853864#comment-3898996 - curl -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-853864_2.patch + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-853864_2.patch patch -p0 < views-853864_2.patch &> /dev/null # https://drupal.org/node/402944#comment-5370400 - curl -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-unpack_options-cache-6.2-51.patch + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-unpack_options-cache-6.2-51.patch patch -p1 < views-unpack_options-cache-6.2-51.patch &> /dev/null cd ../imagecache # https://drupal.org/node/1243258#comment-4850634 - curl -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/imagecache-1243258-5.patch + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/imagecache-1243258-5.patch patch -p1 < imagecache-1243258-5.patch &> /dev/null rm -f -r $_SHRD_PRPATH/themes/{rubik,tao} cd $_SHRD_PRPATH/themes @@ -1469,7 +1469,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_NODESTREAM7-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_NODESTREAM7-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_NODESTREAM7" ] ; then mv $_REAL_PRNAME-$_NODESTREAM7 $_SHRD_PLNAME fi @@ -1516,7 +1516,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENACADEMY-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENACADEMY-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_OPENACADEMY" ] ; then mv $_REAL_PRNAME-$_OPENACADEMY $_SHRD_PLNAME fi @@ -1563,13 +1563,13 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then prepare_drupal6_core fi cd $_CORE - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENATRIUM6-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENATRIUM6-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_OPENATRIUM6" ] ; then mv $_REAL_PRNAME-$_OPENATRIUM6 $_SHRD_PLNAME fi cd $_SHRD_PRPATH/modules/contrib/imagecache # https://drupal.org/node/1243258#comment-4850634 - curl -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/imagecache-1243258-5.patch + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/imagecache-1243258-5.patch patch -p1 < imagecache-1243258-5.patch &> /dev/null nocore_d6_dist_clean rm -f -r $_SHRD_PLPATH/profiles/default @@ -1629,7 +1629,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENATRIUM7-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENATRIUM7-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_OPENATRIUM7" ] ; then mv $_REAL_PRNAME-$_OPENATRIUM7 $_SHRD_PLNAME fi @@ -1677,7 +1677,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENBLOG-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENBLOG-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_OPENBLOG" ] ; then mv $_REAL_PRNAME-$_OPENBLOG $_SHRD_PLNAME fi @@ -1733,7 +1733,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENCHURCH-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENCHURCH-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_OPENCHURCH" ] ; then mv $_REAL_PRNAME-$_OPENCHURCH $_SHRD_PLNAME fi @@ -1786,7 +1786,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENDEALS-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENDEALS-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_OPENDEALS" ] ; then mv $_REAL_PRNAME-$_OPENDEALS $_SHRD_PLNAME fi @@ -1835,7 +1835,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENOUTREACH-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENOUTREACH-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_OPENOUTREACH" ] ; then mv $_REAL_PRNAME-$_OPENOUTREACH $_SHRD_PLNAME fi @@ -1884,7 +1884,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENPUBLISH-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_OPENPUBLISH-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_OPENPUBLISH" ] ; then mv $_REAL_PRNAME-$_OPENPUBLISH $_SHRD_PLNAME fi @@ -1999,7 +1999,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_PANOPOLY-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_PANOPOLY-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_PANOPOLY" ] ; then mv $_REAL_PRNAME-$_PANOPOLY $_SHRD_PLNAME fi @@ -2103,7 +2103,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_RECRUITER-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_RECRUITER-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_RECRUITER" ] ; then mv $_REAL_PRNAME-$_RECRUITER $_SHRD_PLNAME fi @@ -2151,7 +2151,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_SPARK-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_SPARK-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_SPARK" ] ; then mv $_REAL_PRNAME-$_SPARK $_SHRD_PLNAME fi @@ -2200,7 +2200,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then if [ ! -e "$_D7_CORE_DIR" ] ; then prepare_drupal7_core fi - curl -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_TOTEM-core.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://ftp.drupal.org/files/projects/$_REAL_PRNAME-$_TOTEM-core.tar.gz" | tar -xzf - if [ -d "$_CORE/$_REAL_PRNAME-$_TOTEM" ] ; then mv $_REAL_PRNAME-$_TOTEM $_SHRD_PLNAME fi @@ -2261,7 +2261,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then cd $_CORE mkdir -p $_SHRD_PRPATH/{modules,themes,libraries} cd $_SHRD_PRPATH/libraries - curl -s --retry 10 --retry-delay 15 -A iCab "https://codeload.github.com/jackmoore/colorbox/zip/master" -o colorbox-master.zip + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "https://codeload.github.com/jackmoore/colorbox/zip/master" -o colorbox-master.zip unzip -qq colorbox-master.zip &> /dev/null rm -f colorbox-master.zip mv -f colorbox-master colorbox @@ -2289,7 +2289,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then patch -p1 < /opt/tmp/$_BOA_REPO_NAME/aegir/patches/$_VIRT_PRNAME-1167276-reroll.patch &> /dev/null cd $_SHRD_PRPATH/modules/imagecache # https://drupal.org/node/1243258#comment-4850634 - curl -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/imagecache-1243258-5.patch + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/imagecache-1243258-5.patch patch -p1 < imagecache-1243258-5.patch &> /dev/null cd $_SHRD_PRPATH/themes get_dev_contrib "fusion-6.x-1.x-dev.tar.gz" &> /dev/null @@ -2338,7 +2338,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then sed -i "s/version = VERSION/version = \"$_SMALLCORE7\"/g" $_SHRD_PLPATH/profiles/minimal/minimal.info &> /dev/null mkdir -p $_SHRD_PRPATH/libraries cd $_SHRD_PRPATH/libraries - curl -s --retry 10 --retry-delay 15 -A iCab "https://codeload.github.com/jackmoore/colorbox/zip/master" -o colorbox-master.zip + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "https://codeload.github.com/jackmoore/colorbox/zip/master" -o colorbox-master.zip unzip -qq colorbox-master.zip &> /dev/null rm -f colorbox-master.zip mv -f colorbox-master colorbox @@ -2356,7 +2356,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then get_dev_contrib "views-7.x-3.7.tar.gz" &> /dev/null cd $_SHRD_PRPATH/modules/views # https://drupal.org/node/1766338#comment-6445882 - curl -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-revert-broken-filter-or-groups-1766338-7.patch + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-revert-broken-filter-or-groups-1766338-7.patch patch -p1 < views-revert-broken-filter-or-groups-1766338-7.patch &> /dev/null else get_distro_ext "$_SHRD_PLNAME.tar.gz" &> /dev/null @@ -2402,7 +2402,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then sed -i "s/version = VERSION/version = \"$_SMALLCORE7\"/g" $_SHRD_PLPATH/profiles/testing/testing.info &> /dev/null mkdir -p $_SHRD_PRPATH/libraries cd $_SHRD_PRPATH/libraries - curl -s --retry 10 --retry-delay 15 -A iCab "https://codeload.github.com/jackmoore/colorbox/zip/master" -o colorbox-master.zip + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "https://codeload.github.com/jackmoore/colorbox/zip/master" -o colorbox-master.zip unzip -qq colorbox-master.zip &> /dev/null rm -f colorbox-master.zip mv -f colorbox-master colorbox @@ -2420,7 +2420,7 @@ if [ ! -d "$_SHRD_PLPATH" ] ; then get_dev_contrib "views-7.x-3.7.tar.gz" &> /dev/null cd $_SHRD_PRPATH/modules/views # https://drupal.org/node/1766338#comment-6445882 - curl -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-revert-broken-filter-or-groups-1766338-7.patch + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab http://files.aegir.cc/dev/patches/views-revert-broken-filter-or-groups-1766338-7.patch patch -p1 < views-revert-broken-filter-or-groups-1766338-7.patch &> /dev/null else get_distro_ext "$_SHRD_PLNAME.tar.gz" &> /dev/null diff --git a/aegir/scripts/AegirSetupM.sh.txt b/aegir/scripts/AegirSetupM.sh.txt index 1138314d7..8c9f0dc14 100644 --- a/aegir/scripts/AegirSetupM.sh.txt +++ b/aegir/scripts/AegirSetupM.sh.txt @@ -160,7 +160,7 @@ extract_archive () { # Download and extract from dev. get_dev_ext () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" extract_archive "$1" fi } @@ -291,7 +291,7 @@ else get_dev_ext "clean_missing_modules.tar.gz" &> /dev/null else cd $_ROOT/.drush - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - msg "INFO: Downloading Drush and Provision extensions..." get_dev_ext "clean_missing_modules.tar.gz" &> /dev/null get_dev_ext "drush_ecl.tar.gz" &> /dev/null diff --git a/aegir/scripts/AegirUpgrade.sh.txt b/aegir/scripts/AegirUpgrade.sh.txt index da097a5a9..9c78a7491 100644 --- a/aegir/scripts/AegirUpgrade.sh.txt +++ b/aegir/scripts/AegirUpgrade.sh.txt @@ -165,7 +165,7 @@ extract_archive () { # get_dev_ext () { if [ ! -z $1 ] ; then - curl -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" + curl -L --max-redirs 10 -k -s -O --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/$_AEGIR_VERSION/$1" extract_archive "$1" fi } @@ -244,7 +244,7 @@ hostmaster_go_up () { git clone --branch 7.x-2.x git://github.com/omega8cc/provision_boost.git $_ROOT/.drush/provision_boost &> /dev/null else cd $_ROOT/.drush - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/provision-$_AEGIR_VERSION.tar.gz" | tar -xzf - msg "INFO: Downloading Drush and Provision extensions..." _G_EXT="drush_ecl provision_boost provision_cdn registry_rebuild security_review" for e in $_G_EXT; do diff --git a/aegir/tools/BOND.sh.txt b/aegir/tools/BOND.sh.txt index 325d0ee40..e99056df3 100755 --- a/aegir/tools/BOND.sh.txt +++ b/aegir/tools/BOND.sh.txt @@ -790,11 +790,11 @@ tune_sql_memory_limits () { msg "INFO: Running MySQLTuner check on all databases..." msg "NOTE! This step may take a LONG time, please wait..." rm -f /var/opt/mysqltuner* - ### curl -s --retry 10 --retry-delay 15 -A iCab "https://raw.github.com/major/MySQLTuner-perl/master/mysqltuner.pl" -o /var/opt/mysqltuner.pl - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/mysqltuner.pl" -o /var/opt/mysqltuner.pl + ### curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "https://raw.githubusercontent.com/major/MySQLTuner-perl/master/mysqltuner.pl" -o /var/opt/mysqltuner.pl + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/mysqltuner.pl" -o /var/opt/mysqltuner.pl if [ ! -e "/var/opt/mysqltuner.pl" ] ; then mrun "sleep 60" - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/mysqltuner.pl" -o /var/opt/mysqltuner.pl + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/dev/mysqltuner.pl" -o /var/opt/mysqltuner.pl fi if [ -e "/var/opt/mysqltuner.pl" ] ; then perl /var/opt/mysqltuner.pl > /var/opt/mysqltuner-$_INSTALLER_VERSION-$_NOW.txt 2>&1 @@ -1223,7 +1223,7 @@ if [ "$_AEGIR_VERSION" = "HEAD" ] ; then cd /opt/tmp fi else - curl -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/boa-$_INSTALLER_VERSION.tar.gz" | tar -xzf - + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/stable/tar/boa-$_INSTALLER_VERSION.tar.gz" | tar -xzf - _BOA_REPO_NAME="boa" fi # diff --git a/aegir/tools/bin/barracuda b/aegir/tools/bin/barracuda index 09ffbd35d..5ec412d2d 100755 --- a/aegir/tools/bin/barracuda +++ b/aegir/tools/bin/barracuda @@ -231,7 +231,7 @@ up_finish () echo if [ "$ifauto" = "auto" ] || [ "$_NEEDS_UPDATE" = "YES" ] ; then rm -f /var/backups/BOA.sh.txt-* - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/BOA.sh.txt" -o /var/backups/BOA.sh.txt-$_NOW + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/BOA.sh.txt" -o /var/backups/BOA.sh.txt-$_NOW exec bash /var/backups/BOA.sh.txt-$_NOW &> /dev/null rm -f /var/backups/BOA.sh.txt-$_NOW fi @@ -242,9 +242,9 @@ up_stable () { up_start if [ "$silent" = "stock" ] || [ "$silent" = "aegir" ] ; then - curl -s --retry 10 --retry-delay 5 -A iCab "https://raw.github.com/omega8cc/boa/master/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "https://raw.githubusercontent.com/omega8cc/boa/master/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt else - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/stable/txt/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/stable/txt/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt fi up_action up_finish @@ -253,7 +253,7 @@ up_stable () up_head () { up_start - curl -s --retry 10 --retry-delay 5 -A iCab "https://raw.github.com/omega8cc/boa/master/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "https://raw.githubusercontent.com/omega8cc/boa/master/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt up_action up_finish } @@ -261,7 +261,7 @@ up_head () up_legacy () { up_start - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/legacy/txt/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/legacy/txt/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt up_action up_finish } @@ -278,12 +278,12 @@ set_pin_priority () if [ "$_THIS_OS" = "Debian" ] ; then _THIS_RV=$(grep "6.0" /etc/issue.net) if [[ "$_THIS_RV" =~ "6.0" ]] ; then - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-squeeze.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-squeeze.txt" -o /etc/apt/preferences else - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-wheezy.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-wheezy.txt" -o /etc/apt/preferences fi elif [ "$_THIS_OS" = "Ubuntu" ] ; then - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-ubuntu.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-ubuntu.txt" -o /etc/apt/preferences fi fi _THIS_DO=$(grep "Ubuntu 12.04" /etc/issue.net) @@ -300,7 +300,7 @@ download_wrapper () echo "I can not connect to files.aegir.cc at the moment" echo "I will try again in 15 seconds, please wait..." sleep 15 - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE fi } @@ -308,7 +308,7 @@ check_wrapper () { rm -f /var/backups/$(basename "$0")-now-* _THIS_FILE="/var/backups/$(basename "$0")-now-$_NOW" - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE if [ ! -e "$_THIS_FILE" ] ; then download_wrapper if [ ! -e "$_THIS_FILE" ] ; then @@ -347,7 +347,7 @@ check_dns_curl () echo "nameserver 8.8.4.4" >>/etc/resolv.conf fi fi - _CURL_TEST=$(curl -s -I "http://files.aegir.cc" 2> /dev/null) + _CURL_TEST=$(curl -L --max-redirs 10 -k -s -I "http://files.aegir.cc" 2> /dev/null) if [[ "$_CURL_TEST" =~ "200 OK" ]] ; then _DO_NOTHING=YES else diff --git a/aegir/tools/bin/boa b/aegir/tools/bin/boa index 991dbec53..cb3d1871c 100755 --- a/aegir/tools/bin/boa +++ b/aegir/tools/bin/boa @@ -121,12 +121,12 @@ set_pin_priority () if [ "$_THIS_OS" = "Debian" ] ; then _THIS_RV=$(grep "6.0" /etc/issue.net) if [[ "$_THIS_RV" =~ "6.0" ]] ; then - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-squeeze.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-squeeze.txt" -o /etc/apt/preferences else - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-wheezy.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-wheezy.txt" -o /etc/apt/preferences fi elif [ "$_THIS_OS" = "Ubuntu" ] ; then - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-ubuntu.txt" -o /etc/apt/preferences + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/etc-apt-preferences-ubuntu.txt" -o /etc/apt/preferences fi rm -f /var/backups/etc-apt-preferences-* fi @@ -151,7 +151,7 @@ init_finish () echo if [ "$_NEEDS_UPDATE" = "YES" ] ; then rm -f /var/backups/BOA.sh.txt-* - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/BOA.sh.txt" -o /var/backups/BOA.sh.txt-$_NOW + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/BOA.sh.txt" -o /var/backups/BOA.sh.txt-$_NOW exec bash /var/backups/BOA.sh.txt-$_NOW &> /dev/null rm -f /var/backups/BOA.sh.txt-$_NOW fi @@ -175,18 +175,18 @@ init_setup () fi if [ "$mode" = "stock" ] ; then cmmand=in-head - curl -s --retry 10 --retry-delay 5 -A iCab "https://raw.github.com/omega8cc/boa/master/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt - curl -s --retry 10 --retry-delay 5 -A iCab "https://raw.github.com/omega8cc/boa/master/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "https://raw.githubusercontent.com/omega8cc/boa/master/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "https://raw.githubusercontent.com/omega8cc/boa/master/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt else if [ "$cmmand" = "in-head" ] ; then - curl -s --retry 10 --retry-delay 5 -A iCab "https://raw.github.com/omega8cc/boa/master/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt - curl -s --retry 10 --retry-delay 5 -A iCab "https://raw.github.com/omega8cc/boa/master/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "https://raw.githubusercontent.com/omega8cc/boa/master/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "https://raw.githubusercontent.com/omega8cc/boa/master/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt elif [ "$cmmand" = "in-stable" ] ; then - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/stable/txt/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/stable/txt/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/stable/txt/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/stable/txt/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt elif [ "$cmmand" = "in-legacy" ] ; then - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/legacy/txt/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/legacy/txt/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/legacy/txt/BARRACUDA.sh.txt" -o BARRACUDA.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/legacy/txt/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt fi fi barracuda_install @@ -200,7 +200,7 @@ download_wrapper () echo "I can not connect to files.aegir.cc at the moment" echo "I will try again in 15 seconds, please wait..." sleep 15 - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE fi } @@ -209,7 +209,7 @@ check_wrapper () mkdir -p /var/backups rm -f /var/backups/$(basename "$0")-now-* _THIS_FILE="/var/backups/$(basename "$0")-now-$_NOW" - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE if [ ! -e "$_THIS_FILE" ] ; then download_wrapper if [ ! -e "$_THIS_FILE" ] ; then @@ -248,7 +248,7 @@ check_dns_curl () echo "nameserver 8.8.4.4" >>/etc/resolv.conf fi fi - _CURL_TEST=$(curl -s -I "http://files.aegir.cc" 2> /dev/null) + _CURL_TEST=$(curl -L --max-redirs 10 -k -s -I "http://files.aegir.cc" 2> /dev/null) if [[ "$_CURL_TEST" =~ "200 OK" ]] ; then _DO_NOTHING=YES else diff --git a/aegir/tools/bin/octopus b/aegir/tools/bin/octopus index d979ef315..ae5a981bc 100755 --- a/aegir/tools/bin/octopus +++ b/aegir/tools/bin/octopus @@ -320,7 +320,7 @@ up_finish () echo if [ "$_NEEDS_UPDATE" = "YES" ] ; then rm -f /var/backups/BOA.sh.txt-* - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/BOA.sh.txt" -o /var/backups/BOA.sh.txt-$_NOW + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/BOA.sh.txt" -o /var/backups/BOA.sh.txt-$_NOW exec bash /var/backups/BOA.sh.txt-$_NOW &> /dev/null rm -f /var/backups/BOA.sh.txt-$_NOW fi @@ -330,7 +330,7 @@ up_finish () up_stable () { up_start - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/stable/txt/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/stable/txt/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt if [ "$second" = "all" ] ; then up_action_all else @@ -342,7 +342,7 @@ up_stable () up_head () { up_start - curl -s --retry 10 --retry-delay 5 -A iCab "https://raw.github.com/omega8cc/boa/master/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "https://raw.githubusercontent.com/omega8cc/boa/master/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt if [ "$second" = "all" ] ; then up_action_all else @@ -354,7 +354,7 @@ up_head () up_legacy () { up_start - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/legacy/txt/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/legacy/txt/OCTOPUS.sh.txt" -o OCTOPUS.sh.txt if [ "$second" = "all" ] ; then up_action_all else @@ -369,7 +369,7 @@ download_wrapper () echo "I can not connect to files.aegir.cc at the moment" echo "I will try again in 15 seconds, please wait..." sleep 15 - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE fi } @@ -378,7 +378,7 @@ check_wrapper () mkdir -p /var/backups rm -f /var/backups/$(basename "$0")-now-* _THIS_FILE="/var/backups/$(basename "$0")-now-$_NOW" - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/versions/master/aegir/tools/bin/$(basename "$0")" -o $_THIS_FILE if [ ! -e "$_THIS_FILE" ] ; then download_wrapper if [ ! -e "$_THIS_FILE" ] ; then @@ -417,7 +417,7 @@ check_dns_curl () echo "nameserver 8.8.4.4" >>/etc/resolv.conf fi fi - _CURL_TEST=$(curl -s -I "http://files.aegir.cc" 2> /dev/null) + _CURL_TEST=$(curl -L --max-redirs 10 -k -s -I "http://files.aegir.cc" 2> /dev/null) if [[ "$_CURL_TEST" =~ "200 OK" ]] ; then _DO_NOTHING=YES else diff --git a/aegir/tools/system/daily.sh b/aegir/tools/system/daily.sh index e2ed46787..3496b4dce 100755 --- a/aegir/tools/system/daily.sh +++ b/aegir/tools/system/daily.sh @@ -232,7 +232,7 @@ fix_user_register_protection () { fix_robots_txt () { if [ ! -e "$Dir/files/robots.txt" ] && [ ! -e "$Plr/profiles/hostmaster" ] && [ "$_STATUS" = "OK" ] ; then - curl -s --retry 3 --retry-delay 15 -A iCab "http://$Dom/robots.txt?nocache=1&noredis=1" -o $Dir/files/robots.txt + curl -L --max-redirs 10 -k -s --retry 3 --retry-delay 15 -A iCab "http://$Dom/robots.txt?nocache=1&noredis=1" -o $Dir/files/robots.txt if [ -e "$Dir/files/robots.txt" ] ; then echo >> $Dir/files/robots.txt fi @@ -1368,7 +1368,7 @@ else /etc/init.d/nginx reload fi rm -f /var/backups/BOA.sh.txt-* - curl -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/BOA.sh.txt" -o /var/backups/BOA.sh.txt-$_NOW + curl -L --max-redirs 10 -k -s --retry 10 --retry-delay 5 -A iCab "http://files.aegir.cc/BOA.sh.txt" -o /var/backups/BOA.sh.txt-$_NOW bash /var/backups/BOA.sh.txt-$_NOW &> /dev/null rm -f /var/backups/BOA.sh.txt-$_NOW fi @@ -1376,7 +1376,7 @@ fi ###--------------------### echo "INFO: Checking BARRACUDA version" rm -f /opt/tmp/barracuda-version.txt* -curl -s --retry 3 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/barracuda-version.txt" -o /opt/tmp/barracuda-version.txt +curl -L --max-redirs 10 -k -s --retry 3 --retry-delay 15 -A iCab "http://files.aegir.cc/versions/master/aegir/conf/barracuda-version.txt" -o /opt/tmp/barracuda-version.txt if [ -e "/opt/tmp/barracuda-version.txt" ] ; then _INSTALLER_VERSION=`cat /opt/tmp/barracuda-version.txt` _VERSIONS_TEST=`cat /var/log/barracuda_log.txt`