Merge remote-tracking branch 'origin/master'

src/aare/daq/aaredb.py

@@ -57,8 +57,9 @@ class AareWrapper:
         configuration.ssl_ca_cert = "/etc/ssl/certs/secrets/mx-aaredb-dmz-01_Full_Chain_CA.pem"
 
         # 2. Present Machine Identity (The certs that worked in curl)
-        configuration.cert_file = "/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.crt"
-        configuration.key_file  = "/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.key"
+            beamline_name = bl.value.lower()
+            configuration.cert_file = f"/etc/ssl/certs/secrets/mx-{beamline_name}-queue-01_from_dmz-01.crt"
+            configuration.key_file  = f"/etc/ssl/certs/secrets/mx-{beamline_name}-queue-01_from_dmz-01.key"
 
         # 3. Initialize the Client with this config
         self.client = aareDB.ApiClient(configuration)

src/aare/daq/spreadsheetupdater.py

@@ -138,9 +138,10 @@ def main():
             # FORCE a clean context
             context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
             context.load_verify_locations(cafile="/etc/ssl/certs/secrets/mx-aaredb-dmz-01_Full_Chain_CA.pem")
+            beamline_name = beamline.value.lower()
             context.load_cert_chain(
-                certfile="/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.crt",
-                keyfile="/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.key"
+                certfile=f"/etc/ssl/certs/secrets/mx-{beamline_name}-queue-01_from_dmz-01.crt",
+                keyfile=f"/etc/ssl/certs/secrets/mx-{beamline_name}-queue-01_from_dmz-01.key"
             )
 
             # Explicitly set the SNI hostname to match NGINX server_name