From 088171a5891614004b91923b7a472b7e22c879df Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 28 Sep 2021 12:14:11 +0800 Subject: [PATCH] Proper defaults for public Ryzom Core 4 shard --- CMakeLists.txt | 16 ++++++++-------- ryzom/client/client_default.cfg | 34 ++++++++++++++++----------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa196df83..2de5fd854 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,14 +94,14 @@ RYZOM_SETUP_PREFIX_PATHS() #----------------------------------------------------------------------------- # Default values for URL's -SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL") -SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL") -SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL") -SET(RYZOM_CLIENT_PATCH_URL "https://cdn.ryzom.dev/open/patch/" CACHE STRING "Ryzom Client Patch URL") -SET(RYZOM_CLIENT_APP_NAME "default") - -SET(RYZOM_CLIENT_RELEASENOTES_URL "https://open.ryzom.dev/releasenotes/index.php" CACHE STRING "Ryzom Client Release Notes URL") -SET(RYZOM_CLIENT_RELEASENOTES_RING_URL "https://open.ryzom.dev/releasenotes_ring/index.php" CACHE STRING "Ryzom Client Release Notes URL") +SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL") +SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL") +SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://core.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL") +SET(RYZOM_CLIENT_PATCH_URL "https://cdn.ryzom.dev/core4/patch/" CACHE STRING "Ryzom Client Patch URL") +SET(RYZOM_CLIENT_APP_NAME "core4") + +SET(RYZOM_CLIENT_RELEASENOTES_URL "https://core4.ryzom.dev/releasenotes/index.php" CACHE STRING "Ryzom Client Release Notes URL") +SET(RYZOM_CLIENT_RELEASENOTES_RING_URL "https://core4.ryzom.dev/releasenotes_ring/index.php" CACHE STRING "Ryzom Client Release Notes URL") #----------------------------------------------------------------------------- # urls when compiling ryzom live client diff --git a/ryzom/client/client_default.cfg b/ryzom/client/client_default.cfg index 8cb3dc55a..a585c640c 100644 --- a/ryzom/client/client_default.cfg +++ b/ryzom/client/client_default.cfg @@ -39,21 +39,21 @@ Gamma_max = 1.0; // NETWORK // ///////////// -Application = { "classic", "./client_ryzom_r.exe", "./" }; +Application = { "core4", "./client_ryzom_r.exe", "./" }; BackgroundDownloader = 0; -SignUpURL = "https://classic.ryzom.dev/ams/?page=register"; -StartupHost = "https://classic.ryzom.dev"; +SignUpURL = "https://core.ryzom.dev/ams/?page=register"; +StartupHost = "https://core.ryzom.dev"; StartupPage = "/login/r2_login.php"; StartupVerify = 1; -InstallStatsUrl = "https://classic.ryzom.dev/stats/stats.php"; -CreateAccountURL = "https://classic.ryzom.dev/ams/?page=register"; -EditAccountURL = "https://classic.ryzom.dev/ams/?page=settings"; +InstallStatsUrl = "https://core.ryzom.dev/stats/stats.php"; +CreateAccountURL = "https://core.ryzom.dev/ams/?page=register"; +EditAccountURL = "https://core.ryzom.dev/ams/?page=settings"; ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html"; -ForgetPwdURL = "https://classic.ryzom.dev/ams/"; -LoginSupportURL = "https://classic.ryzom.dev/ams/"; -NamingPolicyURL = "https://classic.ryzom.dev/ams/"; -InstallWebPage = "https://classic.ryzom.dev/ams/"; -StreamedPackageHosts = { "https://cdn.ryzom.dev/classic/stream/" }; +ForgetPwdURL = "https://core.ryzom.dev/ams/"; +LoginSupportURL = "https://core.ryzom.dev/ams/"; +NamingPolicyURL = "https://core.ryzom.dev/ams/"; +InstallWebPage = "https://core.ryzom.dev/ams/"; +StreamedPackageHosts = { "https://cdn.ryzom.dev/core4/stream/" }; // Full path and filename where cURL can find certificate bundle file // cacert.pem file can be downloaded from https://curl.haxx.se/docs/caextract.html @@ -599,12 +599,12 @@ ScenarioLanguages = {"fr","de","en","other_lang"}; // Map each language to a forum help page HelpPages = { - "fr=https://classic.ryzom.dev/ams/", - "en=https://classic.ryzom.dev/ams/", - "wk=https://classic.ryzom.dev/ams/", - "de=https://classic.ryzom.dev/ams/", - "es=https://classic.ryzom.dev/ams/", - "ru=https://classic.ryzom.dev/ams/" + "fr=https://core.ryzom.dev/ams/", + "en=https://core.ryzom.dev/ams/", + "wk=https://core.ryzom.dev/ams/", + "de=https://core.ryzom.dev/ams/", + "es=https://core.ryzom.dev/ams/", + "ru=https://core.ryzom.dev/ams/" }; // interval in minutes for webig notify thread to run