From 2e6556822f63584e0711ba9dd0c65a20a561887f Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Wed, 21 Mar 2018 10:17:29 +0100 Subject: [PATCH] TT#32751 Commit sipwise.gpg inside Sipwise InstallCD We cannot store the key inside 'include' folder, otherwise the following deployment.sh migration fails on docker unit-tests as it perform shellcheck for all the scripts inside include folder. Let's use separate 'keys' folder here. Change-Id: If44a8838ca5542d01037ca7e7b72ba22b632c0b4 --- .gitignore | 1 - Makefile | 5 ----- templates/scripts/keys/sipwise.gpg | Bin 0 -> 5710 bytes templates/scripts/main.sh | 7 ++++--- 4 files changed, 4 insertions(+), 9 deletions(-) create mode 100644 templates/scripts/keys/sipwise.gpg diff --git a/.gitignore b/.gitignore index fe95b08..96fc48f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ templates/boot/grub/grub.cfg templates/boot/isolinux/isolinux.cfg templates/boot/isolinux/syslinux.cfg templates/scripts/includes/netscript/ -templates/scripts/includes/sipwise.gpg diff --git a/Makefile b/Makefile index a746d82..0ee88ac 100644 --- a/Makefile +++ b/Makefile @@ -11,10 +11,6 @@ build: --no-parent --no-host-directories --cut-dirs=1 "http://deb.sipwise.com/netscript/${RELEASE}/" ; \ echo " done."; - @echo -n "Downloading Sipwise keyring 'sipwise.gpg'"; \ - wget -O ./templates/scripts/includes/sipwise.gpg https://deb.sipwise.com/spce/sipwise.gpg ;\ - echo " done."; - syntaxcheck: shellcheck shellcheck: @@ -29,7 +25,6 @@ shellcheck: clean: rm -f templates/boot/isolinux/syslinux.cfg rm -rf templates/scripts/includes/netscript - rm -f templates/scripts/includes/sipwise.gpg rm -f templates/boot/grub/grub.cfg rm -f templates/boot/isolinux/isolinux.cfg diff --git a/templates/scripts/keys/sipwise.gpg b/templates/scripts/keys/sipwise.gpg new file mode 100644 index 0000000000000000000000000000000000000000..71d1f2384756c5ad33c270a29a3c4e0f18df0613 GIT binary patch literal 5710 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 OmEd~Pily>zHU0}Vwt?6H literal 0 HcmV?d00001 diff --git a/templates/scripts/main.sh b/templates/scripts/main.sh index 5864211..0fdb5b9 100755 --- a/templates/scripts/main.sh +++ b/templates/scripts/main.sh @@ -7,6 +7,7 @@ export LC_ALL=C working_dir="$(dirname "$0")" scripts_dir="${working_dir}/includes/" +keys_dir="${working_dir}/keys/" netscript_dir="${scripts_dir}/netscript/" RC=0 @@ -20,11 +21,11 @@ einfo "Executing grml-sipwise specific checks..." eindent install_sipwise_keyring() { - if [ -f "${scripts_dir}/sipwise.gpg" ]; then + if [ -f "${keys_dir}/sipwise.gpg" ]; then einfo "Installing sipwise keyring to '/etc/apt/trusted.gpg.d/sipwise.gpg'..."; eend 0 - cp "${scripts_dir}/sipwise.gpg" /etc/apt/trusted.gpg.d/sipwise.gpg + cp "${keys_dir}/sipwise.gpg" /etc/apt/trusted.gpg.d/sipwise.gpg else - ewarn "Sipwise keyring '${scripts_dir}/sipwise.gpg' not found, continuing anyway." ; eend 0 + ewarn "Sipwise keyring '${keys_dir}/sipwise.gpg' not found, continuing anyway." ; eend 0 fi }