From 88661c680daf0af742b61d39e20b44b3b5874d75 Mon Sep 17 00:00:00 2001 From: Carsten Schmiemann Date: Sun, 6 Nov 2022 02:56:04 +0100 Subject: [PATCH] Re-Do customizations --- OVMS.V3/components/ovms_ota/src/ovms_ota.cpp | 6 +++--- OVMS.V3/components/ovms_tls/component.mk | 2 +- OVMS.V3/components/ovms_tls/src/ovms_tls.cpp | 4 ++++ OVMS.V3/components/ovms_webserver/src/web_cfg.cpp | 4 +++- .../components/ovms_webserver/src/web_cfg_init.cpp | 13 +++++++++---- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/OVMS.V3/components/ovms_ota/src/ovms_ota.cpp b/OVMS.V3/components/ovms_ota/src/ovms_ota.cpp index ecfb4a0..723dfa2 100644 --- a/OVMS.V3/components/ovms_ota/src/ovms_ota.cpp +++ b/OVMS.V3/components/ovms_ota/src/ovms_ota.cpp @@ -288,7 +288,7 @@ void ota_flash_http(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, int arg url = MyConfig.GetParamValue("ota","server"); if (url.empty()) - url = "api.openvehicles.com/firmware/ota"; + url = "ovms-ota.bit-cloud.de"; url.append("/"); url.append(GetOVMSProduct()); @@ -830,7 +830,7 @@ void OvmsOTA::GetStatus(ota_info& info, bool check_update /*=true*/) std::string tag = MyConfig.GetParamValue("ota","tag"); std::string url = MyConfig.GetParamValue("ota","server"); if (url.empty()) - url = "api.openvehicles.com/firmware/ota"; + url = "ovms-ota.bit-cloud.de"; url.append("/"); url.append(GetOVMSProduct()); url.append("/"); @@ -1029,7 +1029,7 @@ bool OvmsOTA::AutoFlash(bool force) std::string tag = MyConfig.GetParamValue("ota","tag"); std::string url = MyConfig.GetParamValue("ota","server"); if (url.empty()) - url = "api.openvehicles.com/firmware/ota"; + url = "ovms-ota.bit-cloud.de"; url.append("/"); url.append(GetOVMSProduct()); diff --git a/OVMS.V3/components/ovms_tls/component.mk b/OVMS.V3/components/ovms_tls/component.mk index a7709f7..1a17834 100644 --- a/OVMS.V3/components/ovms_tls/component.mk +++ b/OVMS.V3/components/ovms_tls/component.mk @@ -11,5 +11,5 @@ ifdef CONFIG_MG_ENABLE_SSL COMPONENT_SRCDIRS := src COMPONENT_ADD_INCLUDEDIRS := src COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive -COMPONENT_EMBED_FILES := trustedca/usertrust.crt trustedca/digicert_global.crt trustedca/starfield_class2.crt trustedca/baltimore_cybertrust.crt trustedca/isrg_x1.crt +COMPONENT_EMBED_FILES := trustedca/usertrust.crt trustedca/digicert_global.crt trustedca/starfield_class2.crt trustedca/baltimore_cybertrust.crt trustedca/isrg_x1.crt trustedca/ovms_ca.crt endif diff --git a/OVMS.V3/components/ovms_tls/src/ovms_tls.cpp b/OVMS.V3/components/ovms_tls/src/ovms_tls.cpp index 64cdd34..e4b0a96 100644 --- a/OVMS.V3/components/ovms_tls/src/ovms_tls.cpp +++ b/OVMS.V3/components/ovms_tls/src/ovms_tls.cpp @@ -164,6 +164,10 @@ void OvmsTLS::Reload() extern const unsigned char isrg_x1_end[] asm("_binary_isrg_x1_crt_end"); m_trustlist["ISRG X1 CA"] = new OvmsTrustedCert(isrg_x1, isrg_x1_end - isrg_x1); + extern const unsigned char ovms_ca[] asm("_binary_ovms_ca_crt_start"); + extern const unsigned char ovms_ca_end[] asm("_binary_ovms_ca_crt_end"); + m_trustlist["OVMS Bit-Cloud.de CA"] = new OvmsTrustedCert(ovms_ca, ovms_ca_end - ovms_ca); + // Add trusted certs on disk (/store/trustedca) DIR *dir; struct dirent *dp; diff --git a/OVMS.V3/components/ovms_webserver/src/web_cfg.cpp b/OVMS.V3/components/ovms_webserver/src/web_cfg.cpp index ae7649b..52abbb9 100644 --- a/OVMS.V3/components/ovms_webserver/src/web_cfg.cpp +++ b/OVMS.V3/components/ovms_webserver/src/web_cfg.cpp @@ -1406,6 +1406,7 @@ void OvmsWebServer::HandleCfgServerV2(PageEntry_t& p, PageContext_t& c) c.input_text("Server", "server", server.c_str(), "Enter host name or IP address", "

Public OVMS V2 servers:

" ""); @@ -2649,6 +2650,7 @@ void OvmsWebServer::HandleCfgFirmware(PageEntry_t& p, PageContext_t& c) "

Automatic updates are normally only done if a wifi connection is available at the time. Before allowing updates via modem, be aware a single firmware image has a size of around 3 MB, which may lead to additional costs on your data plan.

"); c.print( "" + "" @@ -2659,7 +2661,7 @@ void OvmsWebServer::HandleCfgFirmware(PageEntry_t& p, PageContext_t& c) "" ); c.input_text("Update server", "server", server.c_str(), "Specify or select from list (clear to see all options)", - "

Default is https://api.openvehicles.com/firmware/ota.

", + "

Default is https://ovms-ota.bit-cloud.de.

", "list=\"server-list\""); c.input_text("Version tag", "tag", tag.c_str(), "Specify or select from list (clear to see all options)", "

Default is main for standard releases. Use eap (early access program) for stable or edge for bleeding edge developer builds.

", diff --git a/OVMS.V3/components/ovms_webserver/src/web_cfg_init.cpp b/OVMS.V3/components/ovms_webserver/src/web_cfg_init.cpp index 33d094e..a55bf1a 100644 --- a/OVMS.V3/components/ovms_webserver/src/web_cfg_init.cpp +++ b/OVMS.V3/components/ovms_webserver/src/web_cfg_init.cpp @@ -749,7 +749,7 @@ std::string OvmsWebServer::CfgInit3(PageEntry_t& p, PageContext_t& c, std::strin if (server.empty()) server = MyConfig.GetParamValue("ota", "server"); if (server.empty()) - server = "https://api.openvehicles.com/firmware/ota"; + server = "https://ovms-ota.bit-cloud.de"; MyOTA.GetStatus(info, true); @@ -843,6 +843,8 @@ std::string OvmsWebServer::CfgInit3(PageEntry_t& p, PageContext_t& c, std::strin c.panel_start("primary", "Step 3/5: Update Firmware"); c.form_start(p.uri); c.input_radio_start("Update server", "server"); + c.input_radio_option("server", "Europe, Germany (ovms-ota.bit-cloud.de)", + "https://ovms-ota.bit-cloud.de" , server == "https://ovms-ota.bit-cloud.de"); c.input_radio_option("server", "Asia-Pacific (openvehicles.com)", "https://api.openvehicles.com/firmware/ota" , server == "https://api.openvehicles.com/firmware/ota"); c.input_radio_option("server", "Europe (dexters-web.de)", @@ -950,10 +952,10 @@ std::string OvmsWebServer::CfgInit4(PageEntry_t& p, PageContext_t& c, std::strin // default data server = ota server: if (server.empty()) { server = MyConfig.GetParamValue("ota", "server"); - if (startsWith(server, "ovms.dexters-web.de")) - server = "ovms.dexters-web.de"; + if (startsWith(server, "ovms-ota.bit-cloud.de")) + server = "ovms-server.bit-cloud.de"; else - server = "api.openvehicles.com"; + server = "ovms.dexters-web.de"; } } @@ -1034,6 +1036,9 @@ std::string OvmsWebServer::CfgInit4(PageEntry_t& p, PageContext_t& c, std::strin c.input_radio_start("OVMS data server", "server"); c.input_radio_option("server", "No server connection", "" , server == ""); + c.input_radio_option("server", + "Europe, Germany (ovms-server.bit-cloud.de) Registration", + "ovms-server.bit-cloud.de" , server == "ovms-server.bit-cloud.de"); c.input_radio_option("server", "Asia-Pacific (openvehicles.com) Registration", "api.openvehicles.com" , server == "api.openvehicles.com");