diff --git a/modules/nixos/web-services/glance.nix b/modules/nixos/web-services/glance.nix index 0cd3a12..6442030 100644 --- a/modules/nixos/web-services/glance.nix +++ b/modules/nixos/web-services/glance.nix @@ -8,9 +8,6 @@ let cfg = config.custom.web-services.glance; - perHostDomains = - perHostSitesWidget.widgets |> lib.concatMap (widget: widget.sites) |> lib.map (site: site.domain); - perHostSitesWidget = allHosts |> lib.attrValues @@ -21,7 +18,8 @@ let sites = host.config.custom.meta.sites |> lib.attrValues - |> lib.filter (site: site.domain |> lib.hasSuffix host.config.custom.networking.overlay.fqdn); + |> lib.filter (site: site.domain |> lib.hasSuffix host.config.custom.networking.overlay.fqdn) + |> lib.map (site: site // { timeout = "5s"; }); }) |> lib.filter ({ sites, ... }: sites != [ ]) |> (widgets: { @@ -30,21 +28,24 @@ let inherit widgets; }); + perHostDomains = + perHostSitesWidget.widgets |> lib.concatMap (widget: widget.sites) |> lib.map (site: site.domain); + applicationSitesWidget = allHosts |> lib.attrValues |> lib.concatMap (host: host.config.custom.meta.sites |> lib.attrValues) - |> lib.filter (service: !lib.elem service.domain perHostDomains) + |> lib.filter (site: !lib.elem site.domain perHostDomains) |> lib.groupBy ( - service: - service.domain |> self.lib.isPrivateDomain |> (isPrivate: if isPrivate then "Private" else "Public") + site: + site.domain |> self.lib.isPrivateDomain |> (isPrivate: if isPrivate then "Private" else "Public") ) |> lib.mapAttrsToList ( name: value: { type = "monitor"; cache = "1m"; title = "${name} Services"; - sites = value; + sites = value |> lib.map (site: site // { timeout = "5s"; }); } ) |> (widgets: {