summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2018-08-29 10:54:23 +0200
committerKarel Kočí <karel.koci@nic.cz>2018-08-29 10:56:43 +0200
commite65b36eabb550d1bc1036c6e2eaa3ea25f91651f (patch)
tree22fd7f75a34f659ce6c893d2b2e93db2121215dc
parent359426679613a2a1f87cdbd482093879da015c18 (diff)
downloadlaminar-cnf-e65b36eabb550d1bc1036c6e2eaa3ea25f91651f.tar.gz
laminar-cnf-e65b36eabb550d1bc1036c6e2eaa3ea25f91651f.tar.bz2
laminar-cnf-e65b36eabb550d1bc1036c6e2eaa3ea25f91651f.zip
Use ssh to access our git server
-rw-r--r--ssh/config5
-rwxr-xr-xtemplates/turris3x.run2
-rwxr-xr-xtemplates/turris4x.run2
3 files changed, 7 insertions, 2 deletions
diff --git a/ssh/config b/ssh/config
index 5e0493b..ec35852 100644
--- a/ssh/config
+++ b/ssh/config
@@ -7,3 +7,8 @@ Host upload
User upload
Hostname cynerd.cz
IdentityFile ~/upload.ssh.key
+
+Host git.cynerd.cz cynerd.cz
+ User git
+ Hostname cynerd.cz
+ IdentityFile ~/git.ssh.key
diff --git a/templates/turris3x.run b/templates/turris3x.run
index c99342d..98dfa15 100755
--- a/templates/turris3x.run
+++ b/templates/turris3x.run
@@ -4,7 +4,7 @@ set -e
. utils
echo_stage "Get packages"
-git_clone "https://git.cynerd.cz/openwrt-personal-pkgs" pkgs turris3x
+git_clone "git@cynerd.cz:openwrt-personal-pkgs" pkgs turris3x
SDK="$WORKSPACE/sdk.tar.bz2"
if [ ! -e "$SDK" ] || [ $(expr $(date -u +%s) - $(stat -c %Z "$SDK")) -gt 86400 ]; then
diff --git a/templates/turris4x.run b/templates/turris4x.run
index f83619f..c6e676f 100755
--- a/templates/turris4x.run
+++ b/templates/turris4x.run
@@ -7,7 +7,7 @@ GWORKSPACE=~/workspace/turris4x
MAKE="make -j4 IS_TTY=1 BUILD_LOG=1"
echo_stage "Get packages"
-git_clone "https://git.cynerd.cz/openwrt-personal-pkgs" pkgs
+git_clone "git@cynerd.cz:openwrt-personal-pkgs" pkgs
curl "https://repo.turris.cz/$BOARD-$BRANCH/git-hash" > git-hash
laminar_self_lock sdk