Przeglądaj źródła

fix: stop tracking web panel cert key and generate it under ignored artifacts

Jared Dohrman 4 miesięcy temu
rodzic
commit
4b184a60d9

+ 1 - 1
.gitignore

@@ -17,4 +17,4 @@ compile_commands.json
 .venv/
 venv/
 platformio.local.ini
-src/helpers/mqtt/WebPanelCert.h
+src/helpers/mqtt/generated/

+ 1 - 1
arch/esp32/extra_scripts/generate_web_panel_cert.py

@@ -15,7 +15,7 @@ def render_pem_array(name, pem_text):
 
 
 project_dir = Path(env["PROJECT_DIR"])
-header_path = project_dir / "src/helpers/mqtt/WebPanelCert.h"
+header_path = project_dir / "src/helpers/mqtt/generated/WebPanelCert.h"
 
 if header_path.exists():
     existing = header_path.read_text()

+ 1 - 1
src/helpers/mqtt/MQTTUplink.cpp

@@ -1,7 +1,7 @@
 #include "MQTTUplink.h"
 #include "MQTTCaCerts.h"
 #if defined(WITH_WEB_PANEL) && WITH_WEB_PANEL
-  #include "WebPanelCert.h"
+  #include "generated/WebPanelCert.h"
 #endif
 
 #ifdef WITH_MQTT_UPLINK

+ 0 - 26
src/helpers/mqtt/WebPanelCert.h

@@ -1,26 +0,0 @@
-#pragma once
-
-// AUTO-GENERATED BY generate_web_panel_cert.py. DO NOT COMMIT.
-
-namespace mqtt_web_panel_cert {
-
-static const char kServerCertPem[] =
-    "-----BEGIN CERTIFICATE-----\n"
-    "MIIBiDCCAS2gAwIBAgIUFysjM9xosI98WhPpK1doyLOAkgYwCgYIKoZIzj0EAwIw\n"
-    "GTEXMBUGA1UEAwwObWVzaGNvcmUtbG9jYWwwHhcNMjYwNDA5MDUxODQ4WhcNMzYw\n"
-    "NDA2MDUxODQ4WjAZMRcwFQYDVQQDDA5tZXNoY29yZS1sb2NhbDBZMBMGByqGSM49\n"
-    "AgEGCCqGSM49AwEHA0IABBpVegwc/kZDjVtHXnl0iYbD2vdes7nLztlyRDylcfOD\n"
-    "GoR9hopoc9NernvGJLUFP/+PsjIsfEGmVrmPESnShsWjUzBRMB0GA1UdDgQWBBTi\n"
-    "oWH5V8BvTj9Kla8ki8SHb2vdSTAfBgNVHSMEGDAWgBTioWH5V8BvTj9Kla8ki8SH\n"
-    "b2vdSTAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0kAMEYCIQDjNde/RApq\n"
-    "jx/FYar9+qMMxHeBMrSiOBozTFpcmFr7RgIhAMdVESr6P2urGsxzbYirwURj5H1F\n"
-    "8eej1APpWRRZvvP0\n"
-    "-----END CERTIFICATE-----\n";
-
-static const char kServerKeyPem[] =
-    "-----BEGIN EC PRIVATE KEY-----\n"
-    "MHcCAQEEIPQxD+WYeE2tQja5AVrOgDUHAKJ7TYfELqU55Npb7mJ1oAoGCCqGSM49\n"
-    "AwEHoUQDQgAEGlV6DBz+RkONW0deeXSJhsPa916zucvO2XJEPKVx84MahH2Gimhz\n"
-    "016ue8YktQU//4+yMix8QaZWuY8RKdKGxQ==\n"
-    "-----END EC PRIVATE KEY-----\n";
-}