fix: align FSS logging config with globalConfig pattern

fixing the broken rebase.

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>

Author: brianmcgillion

lib/global-config.nix

@@ -84,6 +84,12 @@ rec {
             default = "";
             description = "Logging listener address";
           };
+
+          port = mkOption {
+            type = types.port;
+            default = 9999;
+            description = "Logging listener port";
+          };
         };
 
         server = {

modules/common/logging/fss.nix

@@ -297,6 +297,8 @@ let
   };
 in
 {
+  _file = ./fss.nix;
+
   options.ghaf.logging.fss = {
     enable = mkOption {
       type = types.bool;

modules/microvm/sysvms/adminvm-base.nix

@@ -107,8 +107,7 @@ in
 
     # Logging - from globalConfig
     logging = {
-      inherit (globalConfig.logging) enable;
-      listener.address = globalConfig.logging.listener.address or "";
+      inherit (globalConfig.logging) enable listener;
       server = {
         inherit (globalConfig.logging) enable;
         endpoint = globalConfig.logging.server.endpoint or "";

modules/microvm/sysvms/appvm-base.nix

@@ -173,8 +173,11 @@ in
       role = "client";
     };
 
-    # Logging
-    logging.client.enable = globalConfig.logging.enable or false;
+    # Logging - from globalConfig
+    logging = {
+      inherit (globalConfig.logging) enable listener;
+      client.enable = globalConfig.logging.enable or false;
+    };
 
     # Security
     security.fail2ban.enable = globalConfig.development.ssh.daemon.enable or false;

modules/microvm/sysvms/audiovm-base.nix

@@ -116,7 +116,11 @@ in
     };
 
     # Logging - from globalConfig
-    logging.client.enable = globalConfig.logging.enable or false;
+    logging = {
+      inherit (globalConfig.logging) enable listener;
+      client.enable = globalConfig.logging.enable or false;
+      server.endpoint = globalConfig.logging.server.endpoint or "";
+    };
 
     security.fail2ban.enable = globalConfig.development.ssh.daemon.enable or false;
 
@@ -133,13 +137,6 @@ in
       managed = hostConfig.users.managed or { };
     };
 
-    # Logging config - from globalConfig (previously from serviceModules.logging)
-    logging = {
-      enable = globalConfig.logging.enable or false;
-      listener.address = globalConfig.logging.listener.address or "";
-      server.endpoint = globalConfig.logging.server.endpoint or "";
-    };
-
     # GIVC configuration - from globalConfig (previously from serviceModules.givc)
     givc = {
       enable = globalConfig.givc.enable or false;

modules/microvm/sysvms/guivm-base.nix

@@ -179,10 +179,9 @@ in
 
     # Logging - from globalConfig
     logging = {
-      inherit (globalConfig.logging) enable;
-      listener.address = globalConfig.logging.listener.address or "";
-      server.endpoint = globalConfig.logging.server.endpoint or "";
+      inherit (globalConfig.logging) enable listener;
       client.enable = globalConfig.logging.enable or false;
+      server.endpoint = globalConfig.logging.server.endpoint or "";
     };
 
     # Services

modules/microvm/sysvms/netvm-base.nix

@@ -125,8 +125,8 @@ in
 
     # Logging - from globalConfig (includes listener address)
     logging = {
+      inherit (globalConfig.logging) enable listener;
       client.enable = globalConfig.logging.enable or false;
-      listener.address = globalConfig.logging.listener.address or "";
       server.endpoint = globalConfig.logging.server.endpoint or "";
     };