ssm-agent: 2.0.633.0 -> 2.3.1319.0

This commit is contained in:
Michael Fellinger 2020-06-26 12:15:08 +02:00
parent 2cd2e7267e
commit d1c4bf967b
No known key found for this signature in database
GPG Key ID: F4D029589C005F89
2 changed files with 44 additions and 9 deletions

View File

@ -29,13 +29,15 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.services.ssm-agent = { systemd.services.ssm-agent = {
users.extraUsers.ssm-user = {};
inherit (cfg.package.meta) description; inherit (cfg.package.meta) description;
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ fake-lsb-release ]; path = [ fake-lsb-release pkgs.coreutils ];
serviceConfig = { serviceConfig = {
ExecStart = "${cfg.package}/bin/agent"; ExecStart = "${cfg.package}/bin/amazon-ssm-agent";
KillMode = "process"; KillMode = "process";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "15min"; RestartSec = "15min";

View File

@ -1,22 +1,56 @@
{ stdenv, fetchFromGitHub, buildGoPackage }: { stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }:
buildGoPackage rec { buildGoPackage rec {
pname = "amazon-ssm-agent"; pname = "amazon-ssm-agent";
version = "2.0.633.0"; version = "2.3.1319.0";
goPackagePath = "github.com/aws/${pname}"; goPackagePath = "github.com/aws/${pname}";
subPackages = [ "agent" ]; subPackages = [
"agent"
"agent/framework/processor/executer/outofproc/worker"
"agent/framework/processor/executer/outofproc/worker"
"agent/framework/processor/executer/outofproc/sessionworker"
"agent/session/logging"
"agent/cli-main"
];
buildInputs = [ makeWrapper ];
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = version;
owner = "aws"; owner = "aws";
repo = pname; repo = pname;
sha256 = "10arshfn2k3m3zzgw8b3xc6ywd0ss73746nq5srh2jir7mjzi4xv"; sha256 = "1yiyhj7ckqa32b1rnbwn7zx89rsj00m5imn1xlpsw002ywxsxbnv";
}; };
preBuild = '' preBuild = ''
mv go/src/${goPackagePath}/vendor strange-vendor mv go/src/${goPackagePath}/vendor strange-vendor
mv strange-vendor/src go/src/${goPackagePath}/vendor mv strange-vendor/src go/src/${goPackagePath}/vendor
cd go/src/${goPackagePath}
echo ${version} > VERSION
substituteInPlace agent/plugins/inventory/gatherers/application/dataProvider.go \
--replace '"github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"' ""
go run agent/version/versiongenerator/version-gen.go
substituteInPlace agent/appconfig/constants_unix.go \
--replace /usr/bin/ssm-document-worker $bin/bin/ssm-document-worker \
--replace /usr/bin/ssm-session-worker $bin/bin/ssm-session-worker \
--replace /usr/bin/ssm-session-logger $bin/bin/ssm-session-logger
cd -
'';
postBuild = ''
mv go/bin/agent go/bin/amazon-ssm-agent
mv go/bin/worker go/bin/ssm-document-worker
mv go/bin/sessionworker go/bin/ssm-session-worker
mv go/bin/logging go/bin/ssm-session-logger
mv go/bin/cli-main go/bin/ssm-cli
'';
postInstall = ''
wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bash}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -24,7 +58,6 @@ buildGoPackage rec {
homepage = "https://github.com/aws/amazon-ssm-agent"; homepage = "https://github.com/aws/amazon-ssm-agent";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin ]; maintainers = with maintainers; [ copumpkin manveru ];
}; };
} }