You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2019/05/29 04:05:27 UTC
[trafficcontrol] branch 3.0.x updated: Https bump (#3637) (#3638)
This is an automated email from the ASF dual-hosted git repository.
dangogh pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/3.0.x by this push:
new 9cf2981 Https bump (#3637) (#3638)
9cf2981 is described below
commit 9cf2981086345f01d12d35c4268af9ec1a69d5ad
Author: Daisy Henderson <Da...@comcast.com>
AuthorDate: Tue May 28 22:05:22 2019 -0600
Https bump (#3637) (#3638)
* Https bump (#3637)
* Docker build change to bump to https
* Dependency changes
* Fixing urls
(cherry picked from commit 6bd490fec13fa690ab9ce1d36bfa8793ae82dadb)
---
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 2 +-
traffic_monitor/build/traffic_monitor.spec | 2 +-
traffic_ops/install/bin/_postinstall | 4 ++--
traffic_router/tomcat-rpm/build_rpm.sh | 4 ++--
traffic_server/spec/trafficserver.spec | 2 +-
traffic_stats/build/traffic_stats.spec | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index f304948..185f011 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -69,7 +69,7 @@ RUN export PERL5LIB=/opt/traffic_ops/app/local/lib/perl5/:/opt/traffic_ops/insta
&& /opt/traffic_ops/install/bin/download_web_deps -i || \
true # keep a failure here from failing all..
-ADD http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz /
+ADD https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz /
EXPOSE 443
WORKDIR /opt/traffic_ops/app
diff --git a/traffic_monitor/build/traffic_monitor.spec b/traffic_monitor/build/traffic_monitor.spec
index ac66637..239fad5 100644
--- a/traffic_monitor/build/traffic_monitor.spec
+++ b/traffic_monitor/build/traffic_monitor.spec
@@ -163,7 +163,7 @@ fi
%attr(755, traffic_monitor, traffic_monitor) /etc/init.d/traffic_monitor
%preun
-# args for hooks: http://www.ibm.com/developerworks/library/l-rpm2/
+# args for hooks: https://www.ibm.com/developerworks/library/l-rpm2/
# if $1 = 0, this is an uninstallation, if $1 = 1, this is an upgrade (don't do anything)
if [ "$1" = "0" ]; then
/sbin/chkconfig traffic_monitor off
diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall
index 586855d..5eed770 100755
--- a/traffic_ops/install/bin/_postinstall
+++ b/traffic_ops/install/bin/_postinstall
@@ -658,12 +658,12 @@ sub setupMaxMind {
if ( $setupMaxmind =~ /^y(?:es)?/ ) {
InstallUtils::logger( "Downloading Maxmind data", "info" );
chdir("/opt/traffic_ops/app/public/routing");
- $result = InstallUtils::execCommand("/usr/bin/wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz");
+ $result = InstallUtils::execCommand("/usr/bin/wget https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz");
if ( $result != 0 ) {
InstallUtils::logger( "Failed to download MaxMind data", "error" );
}
- $result = InstallUtils::execCommand("/usr/bin/wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz");
+ $result = InstallUtils::execCommand("/usr/bin/wget https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz");
if ( $result != 0 ) {
InstallUtils::logger( "Failed to download MaxMind data", "error" );
}
diff --git a/traffic_router/tomcat-rpm/build_rpm.sh b/traffic_router/tomcat-rpm/build_rpm.sh
index 84aedb8..7a4a6ef 100755
--- a/traffic_router/tomcat-rpm/build_rpm.sh
+++ b/traffic_router/tomcat-rpm/build_rpm.sh
@@ -29,7 +29,7 @@ function checkEnvironment() {
fi
. "$functions_sh"
- #
+ #
# get traffic_control src path -- relative to build_rpm.sh script
export PACKAGE="tomcat"
export WORKSPACE=${WORKSPACE:-$TC_DIR}
@@ -55,7 +55,7 @@ function initBuildArea() {
export RELEASE=$TOMCAT_RELEASE
echo "Downloading Tomcat $VERSION.$RELEASE..."
- curl -fo "$RPMBUILD"/SOURCES/apache-tomcat-$VERSION.$RELEASE.tar.gz http://archive.apache.org/dist/tomcat/tomcat-8/v$VERSION.$RELEASE/bin/apache-tomcat-$VERSION.$RELEASE.tar.gz || \
+ curl -fo "$RPMBUILD"/SOURCES/apache-tomcat-$VERSION.$RELEASE.tar.gz https://archive.apache.org/dist/tomcat/tomcat-8/v$VERSION.$RELEASE/bin/apache-tomcat-$VERSION.$RELEASE.tar.gz || \
{ echo "Could not download Tomcat $VERSION.$RELEASE: $?"; exit 1; }
cp "$TR_DIR/tomcat-rpm/tomcat.service" "$RPMBUILD/SOURCES/" || { echo "Could not copy source files: $?"; exit 1; }
diff --git a/traffic_server/spec/trafficserver.spec b/traffic_server/spec/trafficserver.spec
index e1418b3..4c4afb2 100644
--- a/traffic_server/spec/trafficserver.spec
+++ b/traffic_server/spec/trafficserver.spec
@@ -25,7 +25,7 @@ Summary: Apache Traffic Server
Vendor: Comcast
Group: Applications/Communications
License: Apache License, Version 2.0
-URL: http://trafficserver.apache.org/
+URL: https://trafficserver.apache.org/
Source0: %{name}-%{version}.tar.bz2
Patch: %{name}-%{version}-791ddc4.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
diff --git a/traffic_stats/build/traffic_stats.spec b/traffic_stats/build/traffic_stats.spec
index 2a9eaff..de334b6 100644
--- a/traffic_stats/build/traffic_stats.spec
+++ b/traffic_stats/build/traffic_stats.spec
@@ -179,7 +179,7 @@ fi
%attr(755, traffic_stats, traffic_stats) /opt/traffic_stats/influxdb_tools/*
%preun
-# args for hooks: http://www.ibm.com/developerworks/library/l-rpm2/
+# args for hooks: https://www.ibm.com/developerworks/library/l-rpm2/
# if $1 = 0, this is an uninstallation, if $1 = 1, this is an upgrade (don't do anything)
if [ "$1" = "0" ]; then
/sbin/chkconfig traffic_stats off