Commit 00d4ea15 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents eca10a6f bb2e2e26
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@

- [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream.

- `rabbitmq-server` has been updated from 4.0.9 to 4.1.4. The 4.1.0 release includes breaking changes. For more information read the [changelog of 4.1.0](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v4.1.0)

- `lxde` scope has been removed, and its packages have been moved the top-level.

- `pulsemeeter` has been updated to `2.0.0`. The configuration file from older versions has to be deleted. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/theRealCarneiro/pulsemeeter/releases/tag/v2.0.0).
+4 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@
- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
  If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.

- `services.parsoid` and the `nodePackages.parsoid` package have been removed, as the JavaScript-based version this module uses is not compatible with modern MediaWiki versions.

- `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.

- `virtualisation.libvirtd` now uses OVMF images shipped with QEMU for UEFI machines. `virtualisation.libvirtd.qemu.ovmf` has been removed.
@@ -285,6 +287,8 @@

- `services.gateone` has been removed as the package was removed such that it does not work.

- `services.quorum` has been removed as the `quorum` package was broken and abandoned upstream.

- `teleport` has been upgraded from major version 17 to major version 18.
Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/)
and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
+0 −2
Original line number Diff line number Diff line
@@ -903,7 +903,6 @@
  ./services/misc/packagekit.nix
  ./services/misc/paisa.nix
  ./services/misc/paperless.nix
  ./services/misc/parsoid.nix
  ./services/misc/persistent-evdev.nix
  ./services/misc/pghero.nix
  ./services/misc/pinchflat.nix
@@ -1321,7 +1320,6 @@
  ./services/networking/pyload.nix
  ./services/networking/quassel.nix
  ./services/networking/quicktun.nix
  ./services/networking/quorum.nix
  ./services/networking/r53-ddns.nix
  ./services/networking/radicale.nix
  ./services/networking/radvd.nix
+7 −0
Original line number Diff line number Diff line
@@ -234,6 +234,10 @@ in
    (mkRemovedOptionModule [ "services" "pantheon" "files" ] ''
      This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.
    '')
    (mkRemovedOptionModule [ "services" "parsoid" ] ''
      The Javascript version of Parsoid configured through this module does not work with modern MediaWiki versions,
      and has been deprecated by upstream, so it has been removed. MediaWiki comes with a new PHP-based parser built-in, so there is no need for this module.
    '')
    (mkRemovedOptionModule [ "services" "polipo" ] ''
      The polipo project is unmaintained and archived upstream.
    '')
@@ -244,6 +248,9 @@ in
      "services"
      "quagga"
    ] "the corresponding package has been removed from nixpkgs")
    (mkRemovedOptionModule [ "services" "quorum" ] ''
      The corresponding package was broken, abandoned upstream and thus removed from nixpkgs.
    '')
    (mkRemovedOptionModule [
      "services"
      "railcar"
+74 −63
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ let
  inherit (lib)
    mkEnableOption
    mkIf
    mkMerge
    mkOption
    mkPackageOption
    types
@@ -59,8 +60,6 @@ let
  reportdConfigFile = format.generate "tlsrpt-reportd.cfg" {
    tlsrpt_reportd = dropNullValues cfg.reportd.settings;
  };

  withPostfix = config.services.postfix.enable && cfg.configurePostfix;
in

{
@@ -286,7 +285,24 @@ in
    };
  };

  config = mkIf cfg.enable {
  config = mkMerge [
    (mkIf (cfg.enable && config.services.postfix.enable && cfg.configurePostfix) {
      users.users.postfix.extraGroups = [
        "tlsrpt"
      ];

      services.postfix.settings.main = {
        smtp_tlsrpt_enable = true;
        smtp_tlsrpt_socket_name = cfg.collectd.settings.socketname;
      };

      systemd.services.tlsrpt-reportd.serviceConfig = {
        ReadWritePaths = [ "/var/lib/postfix/queue/maildrop" ];
        SupplementaryGroups = [ "postdrop" ];
      };
    })

    (mkIf cfg.enable {
      environment.etc = {
        "tlsrpt/collectd.cfg".source = collectdConfigFile;
        "tlsrpt/fetcher.cfg".source = fetcherConfigFile;
@@ -299,10 +315,6 @@ in
      };
      users.groups.tlsrpt = { };

    users.users.postfix.extraGroups = lib.mkIf withPostfix [
      "tlsrpt"
    ];

      systemd.services.tlsrpt-collectd = {
        description = "TLSRPT datagram collector";
        documentation = [ "man:tlsrpt-collectd(1)" ];
@@ -347,10 +359,9 @@ in
            "AF_INET6"
            "AF_NETLINK"
          ];
        ReadWritePaths = lib.optionals withPostfix [ "/var/lib/postfix/queue/maildrop" ];
        SupplementaryGroups = lib.optionals withPostfix [ "postdrop" ];
          UMask = "0077";
        };
      };
  };
    })
  ];
}
Loading