From fa450b6e9639be0426cdcbfc8f5fdaaf7ac3eb92 Mon Sep 17 00:00:00 2001 From: Olivier Vielpeau Date: Wed, 23 Mar 2016 11:48:02 -0400 Subject: [PATCH 1/2] [install script] Ignore `apt-get update` failures We don't really care whether `apt-get update` succeeds or not when installing apt-transport-https, but we do want to avoid having the whole install script fail when that fails. [skip ci] --- packaging/datadog-agent/source/install_agent.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/datadog-agent/source/install_agent.sh b/packaging/datadog-agent/source/install_agent.sh index 51f7814a64..5c480edbf5 100755 --- a/packaging/datadog-agent/source/install_agent.sh +++ b/packaging/datadog-agent/source/install_agent.sh @@ -128,7 +128,7 @@ if [ $OS = "RedHat" ]; then $sudo_cmd yum -y --disablerepo='*' --enablerepo='datadog' install datadog-agent elif [ $OS = "Debian" ]; then printf "\033[34m\n* Installing apt-transport-https\n\033[0m\n" - $sudo_cmd apt-get update + $sudo_cmd apt-get update || printf "\033[31m'apt-get update' failed, the script will not install the latest version of apt-transport-https.\033[0m\n" $sudo_cmd apt-get install -y apt-transport-https printf "\033[34m\n* Installing APT package sources for Datadog\n\033[0m\n" $sudo_cmd sh -c "echo 'deb http://apt.datadoghq.com/ stable main' > /etc/apt/sources.list.d/datadog.list" From 895893531ada707bc7f79c56873f8e187b6817ce Mon Sep 17 00:00:00 2001 From: Olivier Vielpeau Date: Wed, 23 Mar 2016 12:05:53 -0400 Subject: [PATCH 2/2] [install script] Switch apt repo to https [skip ci] --- packaging/datadog-agent/source/install_agent.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/datadog-agent/source/install_agent.sh b/packaging/datadog-agent/source/install_agent.sh index 5c480edbf5..e401effb1b 100755 --- a/packaging/datadog-agent/source/install_agent.sh +++ b/packaging/datadog-agent/source/install_agent.sh @@ -131,7 +131,7 @@ elif [ $OS = "Debian" ]; then $sudo_cmd apt-get update || printf "\033[31m'apt-get update' failed, the script will not install the latest version of apt-transport-https.\033[0m\n" $sudo_cmd apt-get install -y apt-transport-https printf "\033[34m\n* Installing APT package sources for Datadog\n\033[0m\n" - $sudo_cmd sh -c "echo 'deb http://apt.datadoghq.com/ stable main' > /etc/apt/sources.list.d/datadog.list" + $sudo_cmd sh -c "echo 'deb https://apt.datadoghq.com/ stable main' > /etc/apt/sources.list.d/datadog.list" $sudo_cmd apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 C7A7DA52 printf "\033[34m\n* Installing the Datadog Agent package\n\033[0m\n"