diff options
author | Arian van Putten <arian.vanputten@gmail.com> | 2024-03-16 17:57:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-16 17:57:42 +0100 |
commit | d211b80d2944a41899a6ab24009d9729cca05e49 (patch) | |
tree | 14151a5dfed0a14dbe4e23830a6b9ac64d4264d9 /nixos | |
parent | 606638d91f0e36486f400b0c4e445a58cda5c2e1 (diff) | |
parent | dc158268f7bedccea096098a2fe020362e564f51 (diff) |
Merge pull request #294493 from endgame/ec2-image-ssm-agent
nixos/amazon-image: Enable Amazon SSM Agent by default
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2405.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index ba02a434e327a..1c1fe7f997cf7 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -354,6 +354,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [Lilypond](https://lilypond.org/index.html) and [Denemo](https://www.denemo.org) are now compiled with Guile 3.0. +- The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default. + - The following options of the Nextcloud module were moved into [`services.nextcloud.settings`](#opt-services.nextcloud.settings) and renamed to match the name from Nextcloud's `config.php`: - `logLevel` -> [`loglevel`](#opt-services.nextcloud.settings.loglevel), - `logType` -> [`log_type`](#opt-services.nextcloud.settings.log_type), diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index c7fe1bed51592..77730178422c3 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -79,6 +79,10 @@ in serviceConfig.StandardOutput = "journal+console"; }; + # Amazon-issued AMIs include the SSM Agent by default, so we do the same. + # https://docs.aws.amazon.com/systems-manager/latest/userguide/ami-preinstalled-agent.html + services.amazon-ssm-agent.enable = true; + # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; |