Merge pull request #101 from epics-extensions/backport/82-to-nixos-23.11

[Backport nixos-23.11] nixos/phoebus-alarm-server: put config in /etc, install package
epics-extensions · Jun 6, 2024 · 19dd0f5 · 19dd0f5
2 parents 888ddc7 + edaf77f
commit 19dd0f5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/nixos/modules/phoebus/alarm-server.nix b/nixos/modules/phoebus/alarm-server.nix
@@ -8,6 +8,7 @@
   cfg = config.services.phoebus-alarm-server;
   settingsFormat = pkgs.formats.javaProperties {};
   configFile = settingsFormat.generate "phoebus-alarm-server.properties" cfg.settings;
+  configLocation = "phoebus/alarm-server.properties";
 in {
   options.services.phoebus-alarm-server = {
     enable = lib.mkEnableOption ''
@@ -159,6 +160,12 @@ in {
       }
     ];
 
+    environment = {
+      etc."${configLocation}".source = configFile;
+      # Useful for importing alarm sets
+      systemPackages = [pkgs.epnix.phoebus-alarm-server];
+    };
+
     systemd.services.phoebus-alarm-server = {
       description = "Phoebus Alarm Server";
 
@@ -171,10 +178,10 @@ in {
           args =
             [
               "-noshell"
-              "-settings ${configFile}"
+              "-settings /etc/${configLocation}"
             ]
             ++ (lib.optional cfg.createTopics "-create_topics");
-        in "${pkgs.epnix.phoebus-alarm-server}/bin/phoebus-alarm-server ${lib.concatStringsSep " " args}";
+        in "${lib.getExe pkgs.epnix.phoebus-alarm-server} ${lib.concatStringsSep " " args}";
         DynamicUser = true;
         StateDirectory = "phoebus-alarm-server";
         # TODO: systemd hardening

diff --git a/nixos/tests/phoebus/alarm.py b/nixos/tests/phoebus/alarm.py
@@ -190,3 +190,8 @@ def logger_has_latest_state(_):
     assert alarm_states[2]["current_severity"] == "MAJOR"
     assert alarm_states[2]["severity"] == "MAJOR"
     assert alarm_states[2]["value"] == "4.0"
+
+with subtest("Can export alarm configuration"):
+    server.succeed("phoebus-alarm-server -settings /etc/phoebus/alarm-server.properties -export export.xml")
+    server.succeed("grep ALARM_TEST export.xml")
+    server.copy_from_vm("export.xml")
diff --git a/pkgs/epnix/tools/phoebus/alarm-server/default.nix b/pkgs/epnix/tools/phoebus/alarm-server/default.nix
@@ -53,6 +53,7 @@ in
     meta = {
       description = "Monitor a configurable set of PVs and track their alarm state";
       homepage = "https://control-system-studio.readthedocs.io/en/latest/services/alarm-server/doc/index.html";
+      mainProgram = "phoebus-alarm-server";
       license = lib.licenses.epl10;
       maintainers = with epnixLib.maintainers; [minijackson];
       inherit (jdk.meta) platforms;