Unverified Commit ccf080ee authored by Anthony Roussel's avatar Anthony Roussel
Browse files

amazon-ssm-agent: rename from ssm-agent

parent e80f82aa
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@

- `ps3netsrv` has been replaced with the webman-mod fork, the executable has been renamed from `ps3netsrv++` to `ps3netsrv` and cli parameters have changed.

- `ssm-agent` package and module were renamed to `amazon-ssm-agent` to be consistent with the upstream package name.

## Other Notable Changes {#sec-release-23.11-notable-changes}

- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
+1 −1
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@
  ./services/matrix/matrix-sliding-sync.nix
  ./services/matrix/synapse.nix
  ./services/misc/airsonic.nix
  ./services/misc/amazon-ssm-agent.nix
  ./services/misc/ananicy.nix
  ./services/misc/ankisyncd.nix
  ./services/misc/apache-kafka.nix
@@ -741,7 +742,6 @@
  ./services/misc/spice-autorandr.nix
  ./services/misc/spice-vdagentd.nix
  ./services/misc/spice-webdavd.nix
  ./services/misc/ssm-agent.nix
  ./services/misc/sssd.nix
  ./services/misc/subsonic.nix
  ./services/misc/sundtek.nix
+12 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@

with lib;
let
  cfg = config.services.ssm-agent;
  cfg = config.services.amazon-ssm-agent;

  # The SSM agent doesn't pay attention to our /etc/os-release yet, and the lsb-release tool
  # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM
@@ -16,19 +16,24 @@ let
    esac
  '';
in {
  options.services.ssm-agent = {
    enable = mkEnableOption (lib.mdDoc "AWS SSM agent");
  imports = [
    (mkRenamedOptionModule [ "services" "ssm-agent" "enable" ] [ "services" "amazon-ssm-agent" "enable" ])
    (mkRenamedOptionModule [ "services" "ssm-agent" "package" ] [ "services" "amazon-ssm-agent" "package" ])
  ];

  options.services.amazon-ssm-agent = {
    enable = mkEnableOption (lib.mdDoc "Amazon SSM agent");

    package = mkOption {
      type = types.path;
      description = lib.mdDoc "The SSM agent package to use";
      default = pkgs.ssm-agent.override { overrideEtc = false; };
      defaultText = literalExpression "pkgs.ssm-agent.override { overrideEtc = false; }";
      description = lib.mdDoc "The Amazon SSM agent package to use";
      default = pkgs.amazon-ssm-agent.override { overrideEtc = false; };
      defaultText = literalExpression "pkgs.amazon-ssm-agent.override { overrideEtc = false; }";
    };
  };

  config = mkIf cfg.enable {
    systemd.services.ssm-agent = {
    systemd.services.amazon-ssm-agent = {
      inherit (cfg.package.meta) description;
      after    = [ "network.target" ];
      wantedBy = [ "multi-user.target" ];
+0 −0

File moved.

+0 −0

File moved.

Loading