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/28 22:50:17 UTC
[trafficcontrol] branch master updated: Https bump (#3637)
This is an automated email from the ASF dual-hosted git repository.
dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 6bd490f Https bump (#3637)
6bd490f is described below
commit 6bd490fec13fa690ab9ce1d36bfa8793ae82dadb
Author: Daisy Henderson <Da...@comcast.com>
AuthorDate: Tue May 28 16:50:11 2019 -0600
Https bump (#3637)
* Docker build change to bump to https
* Dependency changes
* Fixing urls
---
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 4 ++--
.../cdn-in-a-box/traffic_portal_integration_test/Dockerfile | 2 +-
infrastructure/docker/build/Dockerfile-docs | 2 +-
infrastructure/docker/build/Dockerfile-grove | 2 +-
infrastructure/docker/build/Dockerfile-grovetccfg | 2 +-
infrastructure/docker/build/Dockerfile-source | 2 +-
infrastructure/docker/build/Dockerfile-traffic_monitor | 2 +-
infrastructure/docker/build/Dockerfile-traffic_ops | 2 +-
infrastructure/docker/build/Dockerfile-traffic_portal | 2 +-
infrastructure/docker/build/Dockerfile-traffic_router | 2 +-
infrastructure/docker/build/Dockerfile-traffic_stats | 2 +-
traffic_control/clients/python/setup.py | 2 +-
traffic_monitor/build/traffic_monitor.spec | 2 +-
traffic_ops/install/bin/_postinstall | 4 ++--
traffic_ops_db/test/docker/Dockerfile-db-admin | 2 +-
traffic_router/tomcat-rpm/build_rpm.sh | 4 ++--
traffic_server/spec/trafficserver.spec | 2 +-
traffic_stats/build/traffic_stats.spec | 2 +-
18 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index ae6ce35..8e7698f 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -24,7 +24,7 @@
FROM centos:7
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
rpm --import https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG && \
yum -y update ca-certificates && \
yum-config-manager --add-repo https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64 && \
@@ -77,7 +77,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/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile b/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile
index 71749bf..f709bec 100644
--- a/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile
@@ -24,7 +24,7 @@ WORKDIR /lang/traffic_portal/test/end_to_end
RUN printf "\n\
[google-chrome] \n\
name=google-chrome \n\
-baseurl=http://dl.google.com/linux/chrome/rpm/stable/x86_64 \n\
+baseurl=https://dl.google.com/linux/chrome/rpm/stable/x86_64 \n\
enabled=1 \n\
gpgcheck=1 \n\
gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub \n\
diff --git a/infrastructure/docker/build/Dockerfile-docs b/infrastructure/docker/build/Dockerfile-docs
index d116a3c..325e0be 100644
--- a/infrastructure/docker/build/Dockerfile-docs
+++ b/infrastructure/docker/build/Dockerfile-docs
@@ -24,7 +24,7 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
yum -y update ca-certificates && \
yum -y install \
epel-release && \
diff --git a/infrastructure/docker/build/Dockerfile-grove b/infrastructure/docker/build/Dockerfile-grove
index 10804ee..63bece2 100644
--- a/infrastructure/docker/build/Dockerfile-grove
+++ b/infrastructure/docker/build/Dockerfile-grove
@@ -24,7 +24,7 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
yum -y update ca-certificates && \
yum -y install \
epel-release && \
diff --git a/infrastructure/docker/build/Dockerfile-grovetccfg b/infrastructure/docker/build/Dockerfile-grovetccfg
index d3c0b1d..7e6a83e 100644
--- a/infrastructure/docker/build/Dockerfile-grovetccfg
+++ b/infrastructure/docker/build/Dockerfile-grovetccfg
@@ -24,7 +24,7 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
yum -y update ca-certificates && \
yum -y install \
epel-release && \
diff --git a/infrastructure/docker/build/Dockerfile-source b/infrastructure/docker/build/Dockerfile-source
index 7c0322f..8d8e756 100644
--- a/infrastructure/docker/build/Dockerfile-source
+++ b/infrastructure/docker/build/Dockerfile-source
@@ -25,7 +25,7 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
yum -y update ca-certificates && \
yum -y install \
epel-release && \
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index 6b5e052..2cdf88c 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -24,7 +24,7 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
yum -y update ca-certificates && \
yum -y install \
epel-release && \
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 30e7146..5fee0de 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -24,7 +24,7 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
yum -y update ca-certificates && \
yum -y install \
epel-release && \
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 6b3bc3b..7186cdc 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -24,7 +24,7 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
yum -y update ca-certificates && \
yum -y install \
epel-release && \
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index 56c1192..af7c7b8 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -24,7 +24,7 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
yum -y update ca-certificates && \
yum -y install \
epel-release && \
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index c6db846..3c3cb23 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -24,7 +24,7 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
- rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
yum -y update ca-certificates && \
yum -y install \
epel-release && \
diff --git a/traffic_control/clients/python/setup.py b/traffic_control/clients/python/setup.py
index e897aa2..e95d666 100755
--- a/traffic_control/clients/python/setup.py
+++ b/traffic_control/clients/python/setup.py
@@ -38,7 +38,7 @@ with open(os.path.join(HERE, "README.rst")) as fd:
author_email="dev@trafficcontrol.apache.org",
description="Python API Client for Traffic Control",
long_description='\n'.join((fd.read(), about["__doc__"])),
- url="http://trafficcontrol.apache.org/",
+ url="https://trafficcontrol.apache.org/",
license="http://www.apache.org/licenses/LICENSE-2.0",
classifiers=[
'Development Status :: 4 - Beta',
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 a876b51..c09190e 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_ops_db/test/docker/Dockerfile-db-admin b/traffic_ops_db/test/docker/Dockerfile-db-admin
index dc27c40..883fe6d 100644
--- a/traffic_ops_db/test/docker/Dockerfile-db-admin
+++ b/traffic_ops_db/test/docker/Dockerfile-db-admin
@@ -27,7 +27,7 @@ RUN yum install -y \
epel-release \
https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-redhat96-9.6-3.noarch.rpm \
git && \
- yum-config-manager --add-repo 'http://vault.centos.org/7.5.1804/os/x86_64/' && \
+ yum-config-manager --add-repo 'https://vault.centos.org/7.5.1804/os/x86_64/' && \
yum -y install --enablerepo=vault* golang-1.9.4
# Override TRAFFIC_OPS_RPM arg to use a different one using --build-arg TRAFFIC_OPS_RPM=... Can be local file or http://...
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