From cc5b50b050a9e68f70b15dc2ed82aa1b5082de9a Mon Sep 17 00:00:00 2001 From: sohalt Date: Tue, 7 Apr 2020 02:03:26 +0200 Subject: [PATCH 1/2] http -> https --- Dockerfile | 4 ++-- README.md | 6 +++--- openstreetmap-tiles-update-expire | 4 ++-- run.sh | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4a6316f..f561c98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update \ && apt-get install wget gnupg2 lsb-core -y \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && echo "deb [ trusted=yes ] http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \ + && echo "deb [ trusted=yes ] https://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \ && apt-get update \ && apt-get install -y apt-transport-https ca-certificates @@ -82,7 +82,7 @@ RUN apt-get install -y --no-install-recommends --allow-unauthenticated \ && rm -rf /var/lib/{apt,dpkg,cache,log}/ # Set up PostGIS -RUN wget http://download.osgeo.org/postgis/source/postgis-3.0.0.tar.gz -O postgis.tar.gz \ +RUN wget https://download.osgeo.org/postgis/source/postgis-3.0.0.tar.gz -O postgis.tar.gz \ && mkdir -p postgis_src \ && tar -xvzf postgis.tar.gz --strip 1 -C postgis_src \ && rm postgis.tar.gz \ diff --git a/README.md b/README.md index 69ce0f7..54d4b7b 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,8 @@ It is also possible to let the container download files for you rather than moun ``` docker run \ - -e DOWNLOAD_PBF=http://download.geofabrik.de/europe/luxembourg-latest.osm.pbf \ - -e DOWNLOAD_POLY=http://download.geofabrik.de/europe/luxembourg.poly \ + -e DOWNLOAD_PBF=https://download.geofabrik.de/europe/luxembourg-latest.osm.pbf \ + -e DOWNLOAD_POLY=https://download.geofabrik.de/europe/luxembourg.poly \ -v openstreetmap-data:/var/lib/postgresql/12/main \ overv/openstreetmap-tile-server \ import @@ -238,7 +238,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/openstreetmap-tiles-update-expire b/openstreetmap-tiles-update-expire index 9e495f6..4650b4a 100644 --- a/openstreetmap-tiles-update-expire +++ b/openstreetmap-tiles-update-expire @@ -111,9 +111,9 @@ if [ $# -eq 1 ] ; then m_info "Initialising Osmosis replication system to $1" mkdir $WORKOSM_DIR $OSMOSIS_BIN --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2> "$OSMOSISLOG" - wget "http://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt + wget "https://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt mv $WORKOSM_DIR/configuration.txt $WORKOSM_DIR/configuration_orig.txt - sed "s!baseUrl=http://planet.openstreetmap.org/replication/minute!baseUrl=https://planet.openstreetmap.org/replication/minute!" $WORKOSM_DIR/configuration_orig.txt > $WORKOSM_DIR/configuration.txt + sed "s!baseUrl=https://planet.openstreetmap.org/replication/minute!baseUrl=https://planet.openstreetmap.org/replication/minute!" $WORKOSM_DIR/configuration_orig.txt > $WORKOSM_DIR/configuration.txt else # make sure the lockfile is removed when we exit and then claim it diff --git a/run.sh b/run.sh index dae1746..97663eb 100755 --- a/run.sh +++ b/run.sh @@ -44,8 +44,8 @@ if [ "$1" = "import" ]; then # Download Luxembourg as sample if no data is provided if [ ! -f /data.osm.pbf ] && [ -z "$DOWNLOAD_PBF" ]; then echo "WARNING: No import file at /data.osm.pbf, so importing Luxembourg as example..." - DOWNLOAD_PBF="http://download.geofabrik.de/europe/luxembourg-latest.osm.pbf" - DOWNLOAD_POLY="http://download.geofabrik.de/europe/luxembourg.poly" + DOWNLOAD_PBF="https://download.geofabrik.de/europe/luxembourg-latest.osm.pbf" + DOWNLOAD_POLY="https://download.geofabrik.de/europe/luxembourg.poly" fi if [ -n "$DOWNLOAD_PBF" ]; then From cca2d00a78bdff152a915fba80131166cbb279bf Mon Sep 17 00:00:00 2001 From: sohalt Date: Tue, 7 Apr 2020 04:30:10 +0200 Subject: [PATCH 2/2] Remove --allow-unauthenticated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f561c98..bf6cdb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get install -y curl \ && wget --quiet -O - https://deb.nodesource.com/setup_10.x | bash - \ && apt-get install -y nodejs -RUN apt-get install -y --no-install-recommends --allow-unauthenticated \ +RUN apt-get install -y --no-install-recommends \ apache2 \ apache2-dev \ autoconf \