From 9cfdd2f3df1a526a597a7c5b2068d6ce596777a0 Mon Sep 17 00:00:00 2001 From: max furman Date: Tue, 2 Mar 2021 11:58:42 -0800 Subject: [PATCH] [action] change step-certificates to step-ca where possible --- Makefile | 22 +++------------------- README.md | 8 ++++---- distribution.md | 8 ++++---- docs/kms.md | 4 ++-- make/bundle.sh | 32 -------------------------------- 5 files changed, 13 insertions(+), 61 deletions(-) delete mode 100755 make/bundle.sh diff --git a/Makefile b/Makefile index 93d52a1b..b019651f 100644 --- a/Makefile +++ b/Makefile @@ -215,7 +215,7 @@ run: ######################################### changelog: - $Q echo "step-certificates ($(DEB_VERSION)) unstable; urgency=medium" > debian/changelog + $Q echo "step-ca ($(DEB_VERSION)) unstable; urgency=medium" > debian/changelog $Q echo >> debian/changelog $Q echo " * See https://github.com/smallstep/certificates/releases" >> debian/changelog $Q echo >> debian/changelog @@ -236,7 +236,7 @@ distclean: clean ################################################# BINARY_OUTPUT=$(OUTPUT_ROOT)binary/ -RELEASE=./.travis-releases +RELEASE=./.ci-releases define BUNDLE_MAKE # $(1) -- Go Operating System (e.g. linux, darwin, windows, etc.) @@ -258,23 +258,7 @@ binary-linux-armv7: binary-darwin: $(call BUNDLE_MAKE,darwin,amd64,,$(BINARY_OUTPUT)darwin/) -define BUNDLE - # $(1) -- Binary Output Dir Name - # $(2) -- Step Platform Name - # $(3) -- Step Binary Architecture - # $(4) -- Step Binary Name (For Windows Comaptibility) - $(q) ./make/bundle.sh "$(BINARY_OUTPUT)$(1)" "$(RELEASE)" "$(VERSION)" "$(2)" "$(3)" "$(4)" "$(5)" "$(6)" -endef - -bundle-linux: binary-linux binary-linux-arm64 binary-linux-armv7 - $(call BUNDLE,linux,linux,amd64,$(BINNAME),$(CLOUDKMS_BINNAME),$(AWSKMS_BINNAME)) - $(call BUNDLE,linux.arm64,linux,arm64,$(BINNAME),$(CLOUDKMS_BINNAME),$(AWSKMS_BINNAME)) - $(call BUNDLE,linux.armv7,linux,armv7,$(BINNAME),$(CLOUDKMS_BINNAME),$(AWSKMS_BINNAME)) - -bundle-darwin: binary-darwin - $(call BUNDLE,darwin,darwin,amd64,$(BINNAME),$(CLOUDKMS_BINNAME),$(AWSKMS_BINNAME)) - -.PHONY: binary-linux binary-darwin bundle-linux bundle-darwin +.PHONY: binary-linux binary-linux-arm64 binary-linux-armv7 binary-darwin ################################################# # Targets for creating step artifacts diff --git a/README.md b/README.md index fbe0a244..afa013dc 100644 --- a/README.md +++ b/README.md @@ -142,13 +142,13 @@ $ brew install step Download the Debian package from the [latest `step-ca` release](https://github.com/smallstep/certificates/releases/latest): ``` - $ wget https://github.com/smallstep/certificates/releases/download/vX.Y.Z/step-certificates_X.Y.Z_amd64.deb + $ wget https://github.com/smallstep/certificates/releases/download/vX.Y.Z/step-ca_X.Y.Z_amd64.deb ``` Install the Debian package: ``` - $ sudo dpkg -i step-certificates_X.Y.Z_amd64.deb + $ sudo dpkg -i step-ca_X.Y.Z_amd64.deb ``` #### Arch Linux @@ -184,14 +184,14 @@ You can use [pacman](https://www.archlinux.org/pacman/) to install the packages. Download the Linux package from the [latest `step-ca` release](https://github.com/smallstep/certificates/releases/latest): ``` - $ wget -O step-ca.tar.gz https://github.com/smallstep/certificates/releases/download/vX.Y.Z/step-certificates_linux_X.Y.Z_amd64.tar.gz + $ wget -O step-ca.tar.gz https://github.com/smallstep/certificates/releases/download/vX.Y.Z/step-ca_linux_X.Y.Z_amd64.tar.gz ``` Install `step-ca` by unzipping and copying the executable over to `/usr/bin`: ``` $ tar -xf step-ca.tar.gz - $ sudo cp step-certificates_X.Y.Z/bin/step-ca /usr/bin + $ sudo cp step-ca_X.Y.Z/bin/step-ca /usr/bin ``` See the [`systemctl` setup section](https://smallstep.com/docs/step-ca/certificate-authority-server-production#running-step-ca-as-a-daemon) for a diff --git a/distribution.md b/distribution.md index 703be042..cf4306f5 100644 --- a/distribution.md +++ b/distribution.md @@ -77,10 +77,10 @@ e.g. `v1.0.2` Travis will build and upload the following artifacts: - * **step-certificates_1.0.3_amd64.deb**: debian package for installation on linux. - * **step-certificates_1.0.3_linux_amd64.tar.gz**: tarball containing a statically compiled linux binary. - * **step-certificates_1.0.3_darwin_amd64.tar.gz**: tarball containing a statically compiled darwin binary. - * **step-certificates.tar.gz**: tarball containing a git archive of the full repo. + * **step-ca_1.0.3_amd64.deb**: debian package for installation on linux. + * **step-ca_linux_1.0.3_amd64.tar.gz**: tarball containing a statically compiled linux binary. + * **step-ca_darwin_1.0.3_amd64.tar.gz**: tarball containing a statically compiled darwin binary. + * **step-ca_1.0.3.tar.gz**: tarball containing a git archive of the full repo. 3. **Update the AUR Arch Linux package** diff --git a/docs/kms.md b/docs/kms.md index 976963c0..4f293132 100644 --- a/docs/kms.md +++ b/docs/kms.md @@ -5,8 +5,8 @@ private keys and sign certificates. Support for multiple KMS are planned, but currently the only Google's Cloud KMS, and Amazon's AWS KMS are supported. A still experimental version for YubiKeys is -also available if you compile -[step-certificates](https://github.com/smallstep/certificates) yourself. +also available if you compile [step-ca](https://github.com/smallstep/certificates) +yourself. ## Google's Cloud KMS diff --git a/make/bundle.sh b/make/bundle.sh deleted file mode 100755 index 269e15dd..00000000 --- a/make/bundle.sh +++ /dev/null @@ -1,32 +0,0 @@ -#/bin/sh -set -ex; - -OUTPUT_DIR=$1 -RELEASE_DIR=$2 - -STEP_VERSION=$3 -STEP_PLATFORM=$4 -STEP_ARCH=$5 -STEP_EXEC_NAME=$6 -STEP_CLOUDKMS_EXEC_NAME=$7 -STEP_AWSKMS_EXEC_NAME=$8 - -BUNDLE_DIR=${OUTPUT_DIR}/bundle - -mkdir -p "$BUNDLE_DIR" "$RELEASE_DIR" -TMP=$(mktemp -d "$BUNDLE_DIR/tmp.XXXX") -trap "rm -rf $TMP" EXIT INT QUIT TERM - -stepName=step-certificates_${STEP_VERSION} -newdir="$TMP/${stepName}" -mkdir -p "$newdir/bin" - -cp "$OUTPUT_DIR/bin/${STEP_EXEC_NAME}" "$newdir/bin/${STEP_EXEC_NAME}" -cp "$OUTPUT_DIR/bin/${STEP_CLOUDKMS_EXEC_NAME}" "$newdir/bin/${STEP_CLOUDKMS_EXEC_NAME}" -cp "$OUTPUT_DIR/bin/${STEP_AWSKMS_EXEC_NAME}" "$newdir/bin/${STEP_AWSKMS_EXEC_NAME}" - -cp README.md "$newdir" -NEW_BUNDLE="${RELEASE_DIR}/step-certificates_${STEP_PLATFORM}_${STEP_VERSION}_${STEP_ARCH}.tar.gz" - -rm -f "$NEW_BUNDLE" -tar -zcvf "$NEW_BUNDLE" -C "$TMP" "${stepName}"