From 5e86a94ce9a7d2cd24027d68d413da44e7e7b319 Mon Sep 17 00:00:00 2001 From: Don Neill Date: Thu, 8 Oct 2026 11:13:15 -0700 Subject: [PATCH 1/3] Update hspower_fei1.yaml and hspower_fei2.yaml to reflect the correct hardware and add hspower_fei3.yaml and hspower_fei4.yaml for the eaton pdus on the FEI --- config/hspower/hspower_fei1.yaml | 14 +++++++------- config/hspower/hspower_fei2.yaml | 14 +++++++------- config/hspower/hspower_fei3.yaml | 29 +++++++++++++++++++++++++++++ config/hspower/hspower_fei4.yaml | 29 +++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 config/hspower/hspower_fei3.yaml create mode 100644 config/hspower/hspower_fei4.yaml diff --git a/config/hspower/hspower_fei1.yaml b/config/hspower/hspower_fei1.yaml index f85bee9..287997e 100644 --- a/config/hspower/hspower_fei1.yaml +++ b/config/hspower/hspower_fei1.yaml @@ -1,18 +1,18 @@ -# HISPEC FEI PDU 1 of 2 (feieaton1) — Eaton EMAT-08/10 networked PDU +# HISPEC FEI PDU 1 of 4 (feidcpdu1) — DLI DC3 (48V) networked PDU # -# First of the two Eaton PDUs in the FEI (front end instrument). +# First of the two DLI DC PDUs in the FEI (front end instrument). # # Usage: -# daemons/hspower/eaton_pdu -c config/hspower/hspower_fei1.yaml +# daemons/hspower/dli_pdu -c config/hspower/hspower_fei1.yaml peer_id: fei1 group_id: hspower hardware: - # feieaton1, per the /etc/hosts table in + # feidcpdu1, per the /etc/hosts table in # docs/build_notes/host_machine_build_notes.rst - ip_address: 192.168.29.105 - tcp_port: 23 + ip_address: 192.168.29.110 + tcp_port: 22 # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has # ten, and this is what decides how many outlet keyword blocks exist; the # daemon logs a warning at startup if it disagrees with the count the PDU @@ -23,7 +23,7 @@ hardware: # docs/operations/systemd.md). All nine PDUs share one login today; point an instance # at different variables if its unit gets its own. username_env: HISPEC_PDU_USERNAME - password_env: HISPEC_PDU_PASSWORD + password_env: HISPEC_FEIDLIPDU_PASSWORD logging: level: INFO diff --git a/config/hspower/hspower_fei2.yaml b/config/hspower/hspower_fei2.yaml index e0de0c3..498c77a 100644 --- a/config/hspower/hspower_fei2.yaml +++ b/config/hspower/hspower_fei2.yaml @@ -1,18 +1,18 @@ -# HISPEC FEI PDU 2 of 2 (feieaton2) — Eaton EMAT-08/10 networked PDU +# HISPEC FEI PDU 2 of 4 (feidcpdu2) — DLI DC3 (48V/24V) networked PDU # -# Second of the two Eaton PDUs in the FEI (front end instrument). +# Second of the two DLI DC PDUs in the FEI (front end instrument). # # Usage: -# daemons/hspower/eaton_pdu -c config/hspower/hspower_fei2.yaml +# daemons/hspower/dli_pdu -c config/hspower/hspower_fei2.yaml peer_id: fei2 group_id: hspower hardware: - # feieaton2, per the /etc/hosts table in + # feidcpdu2, per the /etc/hosts table in # docs/build_notes/host_machine_build_notes.rst - ip_address: 192.168.29.106 - tcp_port: 23 + ip_address: 192.168.29.102 + tcp_port: 22 # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has # ten, and this is what decides how many outlet keyword blocks exist; the # daemon logs a warning at startup if it disagrees with the count the PDU @@ -23,7 +23,7 @@ hardware: # docs/operations/systemd.md). All nine PDUs share one login today; point an instance # at different variables if its unit gets its own. username_env: HISPEC_PDU_USERNAME - password_env: HISPEC_PDU_PASSWORD + password_env: HISPEC_FEIDLIPDU_PASSWORD logging: level: INFO diff --git a/config/hspower/hspower_fei3.yaml b/config/hspower/hspower_fei3.yaml new file mode 100644 index 0000000..581b9c6 --- /dev/null +++ b/config/hspower/hspower_fei3.yaml @@ -0,0 +1,29 @@ +# HISPEC FEI PDU 3 of 4 (feieaton1) — Eaton EMAT-08/10 networked PDU +# +# First of the two Eaton PDUs in the FEI (front end instrument). +# +# Usage: +# daemons/hspower/eaton_pdu -c config/hspower/hspower_fei3.yaml + +peer_id: fei3 +group_id: hspower + +hardware: + # feieaton1, per the /etc/hosts table in + # docs/build_notes/host_machine_build_notes.rst. + ip_address: 192.168.29.105 + tcp_port: 23 + # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has + # ten, and this is what decides how many outlet keyword blocks exist; the + # daemon logs a warning at startup if it disagrees with the count the PDU + # reports. + outlet_count: 8 + # Telnet login. The values never appear here: these name environment + # variables the daemon reads, set root-only in /etc/hispec/secrets.env (see + # docs/operations/systemd.md). All nine PDUs share one login today; point an instance + # at different variables if its unit gets its own. + username_env: HISPEC_PDU_USERNAME + password_env: HISPEC_FEIEATON1_PASSWORD + +logging: + level: INFO diff --git a/config/hspower/hspower_fei4.yaml b/config/hspower/hspower_fei4.yaml new file mode 100644 index 0000000..f5584ae --- /dev/null +++ b/config/hspower/hspower_fei4.yaml @@ -0,0 +1,29 @@ +# HISPEC FEI PDU 4 of 4 (feieaton2) — Eaton EMAT-08/10 networked PDU +# +# Second of the two Eaton PDUs in the FEI (front end instrument). +# +# Usage: +# daemons/hspower/eaton_pdu -c config/hspower/hspower_fei4.yaml + +peer_id: fei4 +group_id: hspower + +hardware: + # feieaton2, per the /etc/hosts table in + # docs/build_notes/host_machine_build_notes.rst. + ip_address: 192.168.29.106 + tcp_port: 23 + # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has + # ten, and this is what decides how many outlet keyword blocks exist; the + # daemon logs a warning at startup if it disagrees with the count the PDU + # reports. + outlet_count: 8 + # Telnet login. The values never appear here: these name environment + # variables the daemon reads, set root-only in /etc/hispec/secrets.env (see + # docs/operations/systemd.md). All nine PDUs share one login today; point an instance + # at different variables if its unit gets its own. + username_env: HISPEC_PDU_USERNAME + password_env: HISPEC_FEIEATON2_PASSWORD + +logging: + level: INFO From 476d1ac68495741c6e91db2bc8dd720d184ac65f Mon Sep 17 00:00:00 2001 From: Don Neill Date: Thu, 8 Oct 2026 11:21:45 -0700 Subject: [PATCH 2/3] Update systemd/instance files for FEI PDUs --- systemd/instances/hspower_fei1.env | 8 ++++---- systemd/instances/hspower_fei2.env | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/systemd/instances/hspower_fei1.env b/systemd/instances/hspower_fei1.env index dd9523f..b109a1b 100644 --- a/systemd/instances/hspower_fei1.env +++ b/systemd/instances/hspower_fei1.env @@ -1,4 +1,4 @@ -# HISPEC FEI PDU 1 of 2 (feieaton1) — Eaton EMAT-08/10 networked PDU (hspower) +# HISPEC FEI PDU 1 of 4 (feidcpdu1) — DLI DC3 (48V) networked PDU (hspower) # # hispec deploy hspower_fei1 # @@ -6,9 +6,9 @@ # config/hspower/hspower_fei1.yaml to /etc/hispec/hspower_fei1.yaml, then # enables and starts the daemon. # -# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_PDU_PASSWORD in -# root-only /etc/hispec/secrets.env, not from here: this file is readable by +# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_FEIDLIPDU_PASSWORD +# in root-only /etc/hispec/secrets.env, not from here: this file is readable by # every hispec-ops member. -HISPEC_DAEMON=hspower/eaton_pdu +HISPEC_DAEMON=hspower/dli_pdu HISPEC_CONFIG=/etc/hispec/hspower_fei1.yaml HISPEC_HOST=hispecserver diff --git a/systemd/instances/hspower_fei2.env b/systemd/instances/hspower_fei2.env index 6e0cc29..343f767 100644 --- a/systemd/instances/hspower_fei2.env +++ b/systemd/instances/hspower_fei2.env @@ -1,4 +1,4 @@ -# HISPEC FEI PDU 2 of 2 (feieaton2) — Eaton EMAT-08/10 networked PDU (hspower) +# HISPEC FEI PDU 2 of 4 (feidcpdu2) — DLI DC3 (48V/24V) networked PDU (hspower) # # hispec deploy hspower_fei2 # @@ -6,9 +6,9 @@ # config/hspower/hspower_fei2.yaml to /etc/hispec/hspower_fei2.yaml, then # enables and starts the daemon. # -# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_PDU_PASSWORD in -# root-only /etc/hispec/secrets.env, not from here: this file is readable by +# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_FEIDLIPDU_PASSWORD +# in root-only /etc/hispec/secrets.env, not from here: this file is readable by # every hispec-ops member. -HISPEC_DAEMON=hspower/eaton_pdu +HISPEC_DAEMON=hspower/dli_pdu HISPEC_CONFIG=/etc/hispec/hspower_fei2.yaml HISPEC_HOST=hispecserver From 153ef5af1d84e48bfb8bc36516402cff36af0ed2 Mon Sep 17 00:00:00 2001 From: Don Neill Date: Thu, 8 Oct 2026 11:22:43 -0700 Subject: [PATCH 3/3] Add systemd/instance files for FEI pdus 3 and 4 --- systemd/instances/hspower_fei3.env | 14 ++++++++++++++ systemd/instances/hspower_fei4.env | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 systemd/instances/hspower_fei3.env create mode 100644 systemd/instances/hspower_fei4.env diff --git a/systemd/instances/hspower_fei3.env b/systemd/instances/hspower_fei3.env new file mode 100644 index 0000000..1ce944b --- /dev/null +++ b/systemd/instances/hspower_fei3.env @@ -0,0 +1,14 @@ +# HISPEC FEI PDU 3 of 4 (feieaton1) — Eaton EMAT-08/10 networked PDU (hspower) +# +# hispec deploy hspower_fei3 +# +# copies this file to /etc/hispec/instances/hspower_fei3.env and +# config/hspower/hspower_fei3.yaml to /etc/hispec/hspower_fei3.yaml, then +# enables and starts the daemon. +# +# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_FEIEATON1_PASSWORD +# in root-only /etc/hispec/secrets.env, not from here: this file is readable by +# every hispec-ops member. +HISPEC_DAEMON=hspower/eaton_pdu +HISPEC_CONFIG=/etc/hispec/hspower_fei3.yaml +HISPEC_HOST=hispecserver diff --git a/systemd/instances/hspower_fei4.env b/systemd/instances/hspower_fei4.env new file mode 100644 index 0000000..297309a --- /dev/null +++ b/systemd/instances/hspower_fei4.env @@ -0,0 +1,14 @@ +# HISPEC FEI PDU 4 of 4 (feieaton2) — Eaton EMAT-08/10 networked PDU (hspower) +# +# hispec deploy hspower_fei4 +# +# copies this file to /etc/hispec/instances/hspower_fei4.env and +# config/hspower/hspower_fei4.yaml to /etc/hispec/hspower_fei4.yaml, then +# enables and starts the daemon. +# +# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_FEIEATON2_PASSWORD +# in root-only /etc/hispec/secrets.env, not from here: this file is readable by +# every hispec-ops member. +HISPEC_DAEMON=hspower/eaton_pdu +HISPEC_CONFIG=/etc/hispec/hspower_fei4.yaml +HISPEC_HOST=hispecserver