From 26dacb4d86adec89c4af4727fe79a2b306966549 Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Mon, 9 Dec 2024 13:00:37 -0600 Subject: [PATCH] Updating OS Package metadata: license and description (#49793) * Updating OS Package metadata: license and description * Adding community license to tarball * Updating build-package to include license for OSS package metadata * Fixing some interpolation errors * Removing unecessary line * Cleaning up the metadata formatting --- Makefile | 1 + build.assets/build-package.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2b40088d21cec..3d50b08426d8e 100644 --- a/Makefile +++ b/Makefile @@ -600,6 +600,7 @@ build-archive: | $(RELEASE_DIR) "$(INSTALL_SCRIPT)" \ README.md \ CHANGELOG.md \ + build.assets/LICENSE-community \ teleport/ echo $(GITTAG) > teleport/VERSION tar $(TAR_FLAGS) -c teleport | gzip -n > $(RELEASE).tar.gz diff --git a/build.assets/build-package.sh b/build.assets/build-package.sh index 56274d0a1dee8..91bb4daa8409a 100755 --- a/build.assets/build-package.sh +++ b/build.assets/build-package.sh @@ -74,9 +74,9 @@ FPM_IMAGE_RPM="public.ecr.aws/gravitational/fpm:centos8-1.15.1-1" # extra package information for linux MAINTAINER="info@goteleport.com" -LICENSE="Apache-2.0" +LICENSE="Teleport Community Edition License" VENDOR="Gravitational" -DESCRIPTION="Teleport is a gateway for managing access to clusters of Linux servers via SSH or the Kubernetes API" +DESCRIPTION="Teleport provides on-demand, least-privileged access to your infrastructure, on a foundation of cryptographic identity and zero trust, with built-in identity and policy governance" DOCS_URL="https://goteleport.com/docs" # check that curl is installed @@ -194,6 +194,7 @@ if [[ "${TELEPORT_TYPE}" == "ent" ]]; then else TYPE_DESCRIPTION="[${TEXT_ARCH} Enterprise edition]" fi + LICENSE_STANZA=() else TARBALL_FILENAME="teleport-v${TELEPORT_VERSION}-${PLATFORM}-${TARBALL_ARCH}${OPTIONAL_TARBALL_SECTION}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz" TAR_PATH="teleport" @@ -204,6 +205,8 @@ else else TYPE_DESCRIPTION="[${TEXT_ARCH} Open source edition]" fi + TYPE_DESCRIPTION="${TYPE_DESCRIPTION} Distributed under the ${LICENSE}" + LICENSE_STANZA=(--license "${LICENSE}") fi # set file list @@ -359,7 +362,6 @@ else --version "${TELEPORT_VERSION}" \ --maintainer "${MAINTAINER}" \ --url "${DOCS_URL}" \ - --license "${LICENSE}" \ --vendor "${VENDOR}" \ --description "${DESCRIPTION} ${TYPE_DESCRIPTION}" \ --architecture ${PACKAGE_ARCH} \ @@ -372,6 +374,7 @@ else --after-upgrade /src/post-upgrade \ ${CONFIG_FILE_STANZA} \ ${FILE_PERMISSIONS_STANZA} \ + "${LICENSE_STANZA[@]}" \ ${RPM_SIGN_STANZA} . # copy created package back to current directory