From a03b94e75b443f9fb7f861f6b4f4be135fc12fb5 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Jun 2022 09:39:25 +0300 Subject: [PATCH 22/22] Make default metaserver URL to use https See osdn #44806 Signed-off-by: Marko Lindqvist --- 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/europe_1901.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 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bootstrap/freeciv.project b/bootstrap/freeciv.project index 7934e54d47..312464e4f4 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 0204c09aa8..1ce499f6ad 100644 --- a/data/scenarios/british-isles.sav +++ b/data/scenarios/british-isles.sav @@ -60,7 +60,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 148ed41ee1..d4bc4862b3 100644 --- a/data/scenarios/earth-large.sav +++ b/data/scenarios/earth-large.sav @@ -60,7 +60,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 98295844e4..e47ad4fae5 100644 --- a/data/scenarios/earth-small.sav +++ b/data/scenarios/earth-small.sav @@ -60,7 +60,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 27f624e47e..9211fbf972 100644 --- a/data/scenarios/europe.sav +++ b/data/scenarios/europe.sav @@ -60,7 +60,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 971a84ff3f..bc1cab63f7 100644 --- a/data/scenarios/europe_1900_WWI.sav +++ b/data/scenarios/europe_1900_WWI.sav @@ -58,7 +58,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/europe_1901.sav b/data/scenarios/europe_1901.sav index 8bdcba3428..9708bead3d 100644 --- a/data/scenarios/europe_1901.sav +++ b/data/scenarios/europe_1901.sav @@ -58,7 +58,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 fa45b444f0..918cc9b33f 100644 --- a/data/scenarios/france.sav +++ b/data/scenarios/france.sav @@ -60,7 +60,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 a6682dc563..0975937b82 100644 --- a/data/scenarios/hagworld.sav +++ b/data/scenarios/hagworld.sav @@ -60,7 +60,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 4f26f6717b..85fcd99a7b 100644 --- a/data/scenarios/iberian-peninsula.sav +++ b/data/scenarios/iberian-peninsula.sav @@ -60,7 +60,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 7b4b18d1bf..b8dc2399ba 100644 --- a/data/scenarios/italy.sav +++ b/data/scenarios/italy.sav @@ -60,7 +60,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 7a83452689..95dbf9f9a1 100644 --- a/data/scenarios/japan.sav +++ b/data/scenarios/japan.sav @@ -60,7 +60,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 1c5309e1fb..85ffd5f0bc 100644 --- a/data/scenarios/north_america.sav +++ b/data/scenarios/north_america.sav @@ -60,7 +60,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 a07fe880ef..7897791aa3 100644 --- a/data/scenarios/tileset-demo.sav +++ b/data/scenarios/tileset-demo.sav @@ -58,7 +58,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 8b41613cc3..144f0de1a9 100644 --- a/data/scenarios/tutorial.sav +++ b/data/scenarios/tutorial.sav @@ -58,7 +58,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 d2e2b57949..d93b5650ea 100644 --- a/doc/README +++ b/doc/README @@ -288,7 +288,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 0d0264ac04..81a24ab65d 100644 --- a/doc/README.packaging +++ b/doc/README.packaging @@ -190,7 +190,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 c0ef4ae73f..ae2596ea2c 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 d4347d3aed..8df8cb67bb 100644 --- a/doc/fr/README.fr +++ b/doc/fr/README.fr @@ -235,7 +235,7 @@ Annoncer la partie : Si vous ne voulez pas limiter la concurrence à vos amis 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 civserver avec l'option '--meta', ou '-m'. diff --git a/doc/it/README.it b/doc/it/README.it index 6a22199eab..056410b330 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 e756b46844..2de4780c45 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 5089dadcc3..bedc6ac862 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 80e378970f..fac37d9e80 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 -- 2.35.1