From fcb44e8082da980a2d03fc16b9970b59f2989858 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 24 Jun 2022 03:50:04 +0300 Subject: [PATCH 59/59] Use https for default modpack list URL See osdn #44807 Signed-off-by: Marko Lindqvist --- bootstrap/freeciv.fcproj | 2 +- bootstrap/freeciv.project | 2 +- doc/README.modpack_installer | 2 +- tools/fcmp/modinst.h | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bootstrap/freeciv.fcproj b/bootstrap/freeciv.fcproj index 51b93d1b5f..552310fb6f 100644 --- a/bootstrap/freeciv.fcproj +++ b/bootstrap/freeciv.fcproj @@ -6,7 +6,7 @@ META_URL https://meta.freeciv.org/metaserver.php # We want default MODPACK_LIST_URL constructed compile time, so not giving # one here. This is just an example. -# MODPACK_LIST_URL http://modpack.freeciv.org/3.2/modpack.list +# MODPACK_LIST_URL https://modpack.freeciv.org/3.2/modpack.list # Where to store user files. Note that changing this after user has already stored # something to the old dir with older version of the project means that those diff --git a/bootstrap/freeciv.project b/bootstrap/freeciv.project index 1a2039ed26..5bf136a460 100644 --- a/bootstrap/freeciv.project +++ b/bootstrap/freeciv.project @@ -3,7 +3,7 @@ META_URL="https://meta.freeciv.org/metaserver.php" # We want default MODPACK_LIST_URL constructed compile time, so not giving # one here. This is just an example. -# MODPACK_LIST_URL="http://modpack.freeciv.org/${DATASUBDIR}/modpack.list" +# MODPACK_LIST_URL="https://modpack.freeciv.org/${DATASUBDIR}/modpack.list" # Where to store user files. Note that changing this after user has already stored # something to the old dir with older version of the project means that those diff --git a/doc/README.modpack_installer b/doc/README.modpack_installer index 25935f6991..0f8c369354 100644 --- a/doc/README.modpack_installer +++ b/doc/README.modpack_installer @@ -126,7 +126,7 @@ modpacks, you need not read on.) To host modpacks, you just need a web server that can host plain static files; you do not need to run any custom code or frameworks on that web server, just to publish files with a specific layout, detailed below. -(You can browse http://modpack.freeciv.org/ for some working examples of +(You can browse https://modpack.freeciv.org/ for some working examples of modpack trees.) Unlike some previous versions, all the standard Windows Freeciv 3.1.x diff --git a/tools/fcmp/modinst.h b/tools/fcmp/modinst.h index 726e2ba2fb..61ec206bea 100644 --- a/tools/fcmp/modinst.h +++ b/tools/fcmp/modinst.h @@ -22,14 +22,14 @@ struct fcmp_params #if IS_DEVEL_VERSION && ! IS_FREEZE_VERSION #ifndef MODPACK_LIST_URL -#define MODPACK_LIST_URL "http://files.freeciv.org/modinst/" DATASUBDIR "/modpack.list" +#define MODPACK_LIST_URL "https://files.freeciv.org/modinst/" DATASUBDIR "/modpack.list" #endif -#define DEFAULT_URL_START "http://files.freeciv.org/modinst/" DATASUBDIR "/" +#define DEFAULT_URL_START "https://files.freeciv.org/modinst/" DATASUBDIR "/" #else /* IS_DEVEL_VERSION */ #ifndef MODPACK_LIST_URL -#define MODPACK_LIST_URL "http://modpack.freeciv.org/" DATASUBDIR "/modpack.list" +#define MODPACK_LIST_URL "https://modpack.freeciv.org/" DATASUBDIR "/modpack.list" #endif -#define DEFAULT_URL_START "http://modpack.freeciv.org/" DATASUBDIR "/" +#define DEFAULT_URL_START "https://modpack.freeciv.org/" DATASUBDIR "/" #endif /* IS_DEVEL_VERSION */ #define EXAMPLE_URL DEFAULT_URL_START "ancients.modpack" -- 2.35.1