From 9a758dee0ce5dd1ef6e947055a7fb22bda89a39e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Jun 2022 09:27:15 +0300 Subject: [PATCH 50/50] Make default metaserver URL to use https See osdn #44806 Signed-off-by: Marko Lindqvist --- bootstrap/freeciv.fcproj | 2 +- bootstrap/freeciv.project | 2 +- data/scenarios/british-isles.sav | 2 +- data/scenarios/earth-large.sav | 2 +- data/scenarios/earth-small.sav | 2 +- data/scenarios/europe.sav | 2 +- data/scenarios/europe_1900_WWI.sav | 2 +- data/scenarios/france.sav | 2 +- data/scenarios/hagworld.sav | 2 +- data/scenarios/iberian-peninsula.sav | 2 +- data/scenarios/italy.sav | 2 +- data/scenarios/japan.sav | 2 +- data/scenarios/north_america.sav | 2 +- data/scenarios/tileset-demo.sav | 2 +- data/scenarios/tutorial.sav | 2 +- doc/README | 2 +- doc/README.packaging | 2 +- doc/ca/README.ca | 2 +- doc/fr/README.fr | 2 +- doc/it/README.it | 2 +- doc/ja/README.ja | 2 +- doc/nl/README.nl | 2 +- doc/sv/README.sv | 2 +- meson.build | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bootstrap/freeciv.fcproj b/bootstrap/freeciv.fcproj index 37bb26457a..51b93d1b5f 100644 --- a/bootstrap/freeciv.fcproj +++ b/bootstrap/freeciv.fcproj @@ -2,7 +2,7 @@ # to use this. # Default metaserver URL -META_URL http://meta.freeciv.org/metaserver.php +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. diff --git a/bootstrap/freeciv.project b/bootstrap/freeciv.project index 9657ef6cee..1a2039ed26 100644 --- a/bootstrap/freeciv.project +++ b/bootstrap/freeciv.project @@ -1,5 +1,5 @@ # Default metaserver URL -META_URL="http://meta.freeciv.org/metaserver.php" +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. diff --git a/data/scenarios/british-isles.sav b/data/scenarios/british-isles.sav index b4d6ee6a51..9f30e036f8 100644 --- a/data/scenarios/british-isles.sav +++ b/data/scenarios/british-isles.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Normal" diff --git a/data/scenarios/earth-large.sav b/data/scenarios/earth-large.sav index 3c95445a75..9a2650b974 100644 --- a/data/scenarios/earth-large.sav +++ b/data/scenarios/earth-large.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Normal" diff --git a/data/scenarios/earth-small.sav b/data/scenarios/earth-small.sav index 3e748379d3..16fbc218b1 100644 --- a/data/scenarios/earth-small.sav +++ b/data/scenarios/earth-small.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Normal" diff --git a/data/scenarios/europe.sav b/data/scenarios/europe.sav index 253154cf00..8536e5cbfe 100644 --- a/data/scenarios/europe.sav +++ b/data/scenarios/europe.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Normal" diff --git a/data/scenarios/europe_1900_WWI.sav b/data/scenarios/europe_1900_WWI.sav index 98c94b6567..5d678af3f2 100644 --- a/data/scenarios/europe_1900_WWI.sav +++ b/data/scenarios/europe_1900_WWI.sav @@ -60,7 +60,7 @@ terrident={"name","identifier" [game] server_state="S_S_RUNNING" meta_patches="none" -meta_server="meta.freeciv.org" +meta_server="https://meta.freeciv.org/metaserver.php" id="OmdZKaenCJnhdyaMdKk58e0ChxUphWxl" serverid="" level="Hard" diff --git a/data/scenarios/france.sav b/data/scenarios/france.sav index ed0d3ce883..fbe1e5f1a3 100644 --- a/data/scenarios/france.sav +++ b/data/scenarios/france.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Normal" diff --git a/data/scenarios/hagworld.sav b/data/scenarios/hagworld.sav index 2cc029b69d..63ccb4cd1e 100644 --- a/data/scenarios/hagworld.sav +++ b/data/scenarios/hagworld.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Easy" diff --git a/data/scenarios/iberian-peninsula.sav b/data/scenarios/iberian-peninsula.sav index 5bcbc7d7fa..e17288e18d 100644 --- a/data/scenarios/iberian-peninsula.sav +++ b/data/scenarios/iberian-peninsula.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Normal" diff --git a/data/scenarios/italy.sav b/data/scenarios/italy.sav index eecb00a1b3..933da25a80 100644 --- a/data/scenarios/italy.sav +++ b/data/scenarios/italy.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Easy" diff --git a/data/scenarios/japan.sav b/data/scenarios/japan.sav index 625b8b28ee..90b805874a 100644 --- a/data/scenarios/japan.sav +++ b/data/scenarios/japan.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Normal" diff --git a/data/scenarios/north_america.sav b/data/scenarios/north_america.sav index 5c5001f542..7d7f1c87f6 100644 --- a/data/scenarios/north_america.sav +++ b/data/scenarios/north_america.sav @@ -62,7 +62,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Normal" diff --git a/data/scenarios/tileset-demo.sav b/data/scenarios/tileset-demo.sav index fd047403f5..a2e0c255f2 100644 --- a/data/scenarios/tileset-demo.sav +++ b/data/scenarios/tileset-demo.sav @@ -60,7 +60,7 @@ terrident={"name","identifier" [game] server_state="S_S_RUNNING" meta_patches="none" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="qzkLhy8fRw3PM1JHcr-FdRvplR-aYc3m" serverid="" level="Easy" diff --git a/data/scenarios/tutorial.sav b/data/scenarios/tutorial.sav index 5c9c80648f..66adffafbb 100644 --- a/data/scenarios/tutorial.sav +++ b/data/scenarios/tutorial.sav @@ -60,7 +60,7 @@ terrident={"name","identifier" [game] server_state="S_S_INITIAL" meta_patches="" -meta_server="http://meta.freeciv.org/metaserver.php" +meta_server="https://meta.freeciv.org/metaserver.php" id="" serverid="" level="Easy" diff --git a/doc/README b/doc/README index b3f7c10a59..c0d75eb1db 100644 --- a/doc/README +++ b/doc/README @@ -280,7 +280,7 @@ Announcing the game: If you do not want to limit your opponents to local friends or AI players, visit the Freeciv metaserver: - http://meta.freeciv.org/ + https://meta.freeciv.org/ It is a list of Freeciv servers. To make your own server announce itself there, start freeciv-server with the '--meta' option, or just '-m' for short. diff --git a/doc/README.packaging b/doc/README.packaging index da97232276..807a6f7398 100644 --- a/doc/README.packaging +++ b/doc/README.packaging @@ -176,7 +176,7 @@ Sadly we have no resources to keep public servers for many different Freeciv versions running. To give your users ability to play on public servers, try to provide them as current Freeciv client version as possible. To see list of currently running public servers, see -"http://meta.freeciv.org/metaserver.php" Note that from the web you +"https://meta.freeciv.org/metaserver.php" Note that from the web you can see complete list, while list shown by Freeciv client only lists compatible servers. diff --git a/doc/ca/README.ca b/doc/ca/README.ca index 9a094b308f..451e433e51 100644 --- a/doc/ca/README.ca +++ b/doc/ca/README.ca @@ -243,7 +243,7 @@ Anunciar la partida: Si no vols limitar els teus rivals a amics locals o jugadors IA, visita el metaservidor de Freeciv: - http://meta.freeciv.org/ + https://meta.freeciv.org/ És una llista de servidors de Freeciv. Per fer que el teu servidor s'hi anunciï, engega civserver amb l'opció '--meta', o '-m' per abreujar. diff --git a/doc/fr/README.fr b/doc/fr/README.fr index a66e21a226..5862e0d5b8 100644 --- a/doc/fr/README.fr +++ b/doc/fr/README.fr @@ -328,7 +328,7 @@ Annoncer la partie : Si vous ne voulez pas limiter vos opposants à des amis locaux ou aux joueurs IA, visitez le métaserveur Freeciv : - http://meta.freeciv.org/ + https://meta.freeciv.org/ C'est une liste de serveurs Freeciv. Pour que votre propre serveur s'y annonce lui-même, lancez freeciv-server avec l'option '--meta', ou diff --git a/doc/it/README.it b/doc/it/README.it index 6a03a75991..916db7a1a9 100644 --- a/doc/it/README.it +++ b/doc/it/README.it @@ -246,7 +246,7 @@ Annunciare il gioco: Se non vuoi limitare il gioco ad amici o giocatori artificiali, visita il metaserver di Freeciv: - http://meta.freeciv.org/ + https://meta.freeciv.org/ E' una lista di server Freeciv. Perche' il tuo server sia annunciato sul metaserver, devi avviare civserver con l'opzione '--meta', o solo '-m' diff --git a/doc/ja/README.ja b/doc/ja/README.ja index f1f075686b..1873f52df5 100644 --- a/doc/ja/README.ja +++ b/doc/ja/README.ja @@ -235,7 +235,7 @@ Freeciv の実行には、サーバ、それからクライアント、AI の起 ローカルの友達や AI プレイヤーに敵を限定したくなければ、 Freeciv メタ サーバを訪れて下さい。 - http://meta.freeciv.org/ + https://meta.freeciv.org/ ここには Freeciv サーバがリストされます。自分のサーバをそこへアナウン スするには、 '--meta' もしくは短かく '-m' オプション付きで civserver diff --git a/doc/nl/README.nl b/doc/nl/README.nl index 3a157745a6..0a40fc1ee4 100644 --- a/doc/nl/README.nl +++ b/doc/nl/README.nl @@ -229,7 +229,7 @@ Aankondigen van het spel: Als u uw opponenten niet wilt beperken tot lokale vrienden of KI-spelers, bezoek dan de Freeciv metaserver: - http://meta.freeciv.org/ + https://meta.freeciv.org/ Het is een lijst van Freeciv servers. Om uw eigen server zich daar te laten aankondigen, start civserver met de '--meta' optie, of gewoon '-m'. diff --git a/doc/sv/README.sv b/doc/sv/README.sv index 5a5c9fbedd..7085c8dde7 100644 --- a/doc/sv/README.sv +++ b/doc/sv/README.sv @@ -235,7 +235,7 @@ Tillkännage spelet: Om man vill ha andra motståndare än lokala vänner och datorstyrda spelare kan man besöka Freecivs metaserver: - http://meta.freeciv.org/ + https://meta.freeciv.org/ Det är en lista över freecivservrar. För att få sin server att anmäla sig där kör man civserver med kommandoradsargumentet "--meta" eller diff --git a/meson.build b/meson.build index 9757d7f4b1..90519e4229 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ add_global_arguments('-DQT_DISABLE_DEPRECATED_BEFORE=0x050b00', language : 'cpp' host_system = host_machine.system() -meta_url = 'http://meta.freeciv.org/metaserver.php' +meta_url = 'https://meta.freeciv.org/metaserver.php' mp_list_url = '' storage_dir = '' default_port = '' -- 2.35.1