Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Amazon Software License #84

Merged
merged 2 commits into from
Sep 10, 2020
Merged

Remove Amazon Software License #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f912984
Remove Amazon Software License
pxaws Sep 10, 2020
2e2303f
Don't duplicate the license and notice file
pxaws Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions packaging/debian/amazon-cloudwatch-agent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# Copyright 2017 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://aws.amazon.com/asl/
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

description "Amazon CloudWatch Agent"
author "Amazon.com"
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Section: admin
Depends: libc6
Priority: optional
Copyright: Amazon Software License. Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright: MIT License. Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
Maintainer: Amazon.com, Inc.
Description: Amazon CloudWatch Agent

14 changes: 2 additions & 12 deletions packaging/debian/preinst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# Copyright 2017 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://aws.amazon.com/asl/
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

if [ "$1" = "upgrade" ]; then
/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a stop
Expand Down
14 changes: 2 additions & 12 deletions packaging/debian/prerm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# Copyright 2017 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://aws.amazon.com/asl/
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

if [ "$1" = "remove" ] ; then
/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a preun
Expand Down
14 changes: 2 additions & 12 deletions packaging/dependencies/amazon-cloudwatch-agent-ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
#!/bin/sh

# Copyright 2017 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://aws.amazon.com/asl/
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

set -e
set -u
Expand Down
14 changes: 2 additions & 12 deletions packaging/dependencies/amazon-cloudwatch-agent.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# Copyright 2017 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://aws.amazon.com/asl/
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

# Location: /etc/systemd/system/amazon-cloudwatch-agent.service
# systemctl enable amazon-cloudwatch-agent
Expand Down
14 changes: 2 additions & 12 deletions packaging/linux/amazon-cloudwatch-agent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# Copyright 2017 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://aws.amazon.com/asl/
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

description "Amazon CloudWatch Agent"
author "Amazon.com"
Expand Down
2 changes: 1 addition & 1 deletion packaging/linux/amazon-cloudwatch-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Summary: Amazon CloudWatch Agent
Name: amazon-cloudwatch-agent
Version: %{AGENT_VERSION}
Release: 1
License: Amazon Software License. Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
License: MIT License. Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
Group: Applications/CloudWatch-Agent

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
Expand Down
14 changes: 2 additions & 12 deletions packaging/windows/amazon-cloudwatch-agent-ctl.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# Copyright 2017 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://aws.amazon.com/asl/
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

Param (
[Parameter(Mandatory = $false)]
Expand Down
14 changes: 2 additions & 12 deletions packaging/windows/install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# Copyright 2017 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://aws.amazon.com/asl/
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

Set-StrictMode -Version 2.0
$ErrorActionPreference = "Stop"
Expand Down
14 changes: 2 additions & 12 deletions packaging/windows/uninstall.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# Copyright 2017 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Amazon Software License (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://aws.amazon.com/asl/
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: MIT

Set-StrictMode -Version 2.0
$ErrorActionPreference = "Stop"
Expand Down