From a520be65fa19e66be4f5d9a91e257a6a2b835bc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sat, 28 Nov 2020 17:25:53 +0100
Subject: Move keys to dedicated directory

---
 ssh/config           | 4 ++--
 templates/alpine.run | 4 ++--
 templates/turris.run | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ssh/config b/ssh/config
index 835c90b..c3ad70b 100644
--- a/ssh/config
+++ b/ssh/config
@@ -6,9 +6,9 @@ Host *
 Host upload
 	User upload
 	Hostname cynerd.cz
-	IdentityFile ~/upload.ssh.pub
+	IdentityFile ~/keys/ssh/upload
 
 Host git.cynerd.cz cynerd.cz
 	User git
 	Hostname cynerd.cz
-	IdentityFile ~/git.ssh.pub
+	IdentityFile ~/keys/ssh/git
diff --git a/templates/alpine.run b/templates/alpine.run
index fc0d69b..6811191 100755
--- a/templates/alpine.run
+++ b/templates/alpine.run
@@ -44,8 +44,8 @@ if [ ! -d "$ROOT" ]; then
 		su -l build -c 'mkdir .abuild aports packages'
 		su -l build -c 'echo "PACKAGER_PRIVKEY=\"/build/.abuild/cynerd@email.cz-5b8aeb6d.rsa\"" > .abuild/abuild.conf'
 EOF
-	uroot cp ~/alpinelinux.rsa.key "$ROOT/build/.abuild/cynerd@email.cz-5b8aeb6d.rsa"
-	uroot cp ~/alpinelinux.rsa.key.pub "$ROOT/etc/apk/keys/cynerd@email.cz-5b8aeb6d.rsa.pub"
+	uroot cp ~/keys/alpinelinux.rsa.key "$ROOT/build/.abuild/cynerd@email.cz-5b8aeb6d.rsa"
+	uroot cp ~/keys/alpinelinux.rsa.key.pub "$ROOT/etc/apk/keys/cynerd@email.cz-5b8aeb6d.rsa.pub"
 	uchroot root <<EOF
 		set -e
 		chmod 644 /etc/apk/keys/cynerd@email.cz-5b8aeb6d.rsa.pub
diff --git a/templates/turris.run b/templates/turris.run
index ce1aa12..58a4714 100755
--- a/templates/turris.run
+++ b/templates/turris.run
@@ -67,7 +67,7 @@ find package/feeds/personal -mindepth 1 -maxdepth 1 -printf '%P\n' | \
 	done
 
 echo_stage "Generate index and sign"
-$make package/index BUILD_KEY=~/openwrt-repo.sec
+$make package/index BUILD_KEY=~/keys/openwrt-repo.sec
 
 echo_stage "Deploy"
 ssh upload rm -rf "deploy-turris-$ANIMAL-$BOARD"
-- 
cgit v1.2.3