Update URL of APT packages and key bucket (#467)

stackitcloud · Aug 29, 2024 · d394818 · d394818
1 parent da28785
commit d394818
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/scripts/publish-apt-packages.sh b/scripts/publish-apt-packages.sh
@@ -6,11 +6,10 @@ set -eo pipefail
 
 ROOT_DIR=$(git rev-parse --show-toplevel)
 
-OBJECT_STORAGE_ENDPOINT="https://object.storage.eu01.onstackit.cloud"
+PACKAGES_BUCKET_URL="https://packages.stackit.cloud"
+PUBLIC_KEY_FILE_PATH="keys/key.gpg"
+APT_REPO_PATH="apt/cli"
 APT_BUCKET_NAME="distribution"
-APT_REPO_FOLDER="apt/cli"
-PUBLIC_KEY_BUCKET_NAME="stackit-public-key"
-PUBLIC_KEY_FILE="key.gpg"
 CUSTOM_KEYRING_FILE="aptly-keyring.gpg"
 DISTRIBUTION="stackit"
 APTLY_CONFIG_FILE_PATH="./.aptly.conf"
@@ -22,9 +21,9 @@ echo -n >~/.gnupg/common.conf
 
 # Create a local mirror of the current state of the remote APT repository
 printf ">>> Creating mirror \n"
-curl ${OBJECT_STORAGE_ENDPOINT}/${PUBLIC_KEY_BUCKET_NAME}/${PUBLIC_KEY_FILE} >public.asc
+curl ${PACKAGES_BUCKET_URL}/${PUBLIC_KEY_FILE_PATH} >public.asc
 gpg --no-default-keyring --keyring=${CUSTOM_KEYRING_FILE} --import public.asc
-aptly mirror create -config "${APTLY_CONFIG_FILE_PATH}" -keyring="${CUSTOM_KEYRING_FILE}" current "${OBJECT_STORAGE_ENDPOINT}/${APT_BUCKET_NAME}/${APT_REPO_FOLDER}" ${DISTRIBUTION}
+aptly mirror create -config "${APTLY_CONFIG_FILE_PATH}" -keyring="${CUSTOM_KEYRING_FILE}" current "${PACKAGES_BUCKET_URL}/${APT_REPO_PATH}" ${DISTRIBUTION}
 
 # Update the mirror to the latest state
 printf "\n>>> Updating mirror \n"
@@ -52,4 +51,4 @@ aptly snapshot pull -no-remove -architectures="amd64,i386,arm64" current-snapsho
 
 # Publish the new snapshot to the remote repo
 printf "\n>>> Publishing updated snapshot \n"
-aptly publish snapshot -keyring="${CUSTOM_KEYRING_FILE}" -gpg-key="${GPG_PRIVATE_KEY_FINGERPRINT}" -passphrase "${GPG_PASSPHRASE}" -config "${APTLY_CONFIG_FILE_PATH}" updated-snapshot "s3:${APT_BUCKET_NAME}:${APT_REPO_FOLDER}"
+aptly publish snapshot -keyring="${CUSTOM_KEYRING_FILE}" -gpg-key="${GPG_PRIVATE_KEY_FINGERPRINT}" -passphrase "${GPG_PASSPHRASE}" -config "${APTLY_CONFIG_FILE_PATH}" updated-snapshot "s3:${APT_BUCKET_NAME}:${APT_REPO_PATH}"