summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2019-05-02 13:04:22 +0200
committerKarel Kočí <karel.koci@nic.cz>2019-05-02 13:04:22 +0200
commitf265a9cb95d84e3d8e5e6460c5f5338906c37c04 (patch)
treee8d0f072a6314c1e35410117b5b867f24ad9cf09
parent0f1bbf4cc4fe858a52d94cf27aee65d32109ec44 (diff)
downloadlaminar-cnf-f265a9cb95d84e3d8e5e6460c5f5338906c37c04.tar.gz
laminar-cnf-f265a9cb95d84e3d8e5e6460c5f5338906c37c04.tar.bz2
laminar-cnf-f265a9cb95d84e3d8e5e6460c5f5338906c37c04.zip
Change path to openwrt-key to be *.sec
This is required by signify to make it work.
-rwxr-xr-xjobs/turris-updater-conf.run2
-rwxr-xr-xtemplates/turris.run2
-rwxr-xr-xtemplates/turris3x.run2
3 files changed, 3 insertions, 3 deletions
diff --git a/jobs/turris-updater-conf.run b/jobs/turris-updater-conf.run
index 8e39810..fd2f3e0 100755
--- a/jobs/turris-updater-conf.run
+++ b/jobs/turris-updater-conf.run
@@ -6,7 +6,7 @@ echo_stage "Get personal repository"
git_clone "git@cynerd.cz:openwrt-personal-pkgs" pkgs
echo_stage "Signing"
-signify -S -s ~/openwrt-repo.key -m pkgs/updater.lua
+signify -S -s ~/openwrt-repo.sec -m pkgs/updater.lua
echo_stage "Deploy"
scp -r pkgs/updater.lua{,.sig} upload:
diff --git a/templates/turris.run b/templates/turris.run
index bce60bd..01a56d5 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -45,7 +45,7 @@ find package/feeds/personal -mindepth 1 -maxdepth 1 -printf 'package/%P/compile\
xargs --null $make
echo_stage "Generate index and sign"
-$make package/index BUILD_KEY=~/openwrt-repo.key
+$make package/index BUILD_KEY=~/openwrt-repo.sec
echo_stage "Deploy"
ssh upload rm -rf "deploy-turris-$ANIMAL-$BOARD"
diff --git a/templates/turris3x.run b/templates/turris3x.run
index dfd85d9..b9344d8 100755
--- a/templates/turris3x.run
+++ b/templates/turris3x.run
@@ -26,7 +26,7 @@ echo_stage "Build"
$make
echo_stage "Sign"
-./staging_dir/host/bin/usign -S -s ~/openwrt-repo.key -m "bin/$ARCH/packages/base/Packages"
+./staging_dir/host/bin/usign -S -s ~/openwrt-repo.sec -m "bin/$ARCH/packages/base/Packages"
echo_stage "Deploy"
ssh upload rm -rf "deploy-turris3x-$BOARD"