diff --git a/gitlab-known-hosts b/gitlab-known-hosts index d0a535826b458e3aeb90778a62aa2fefc30a2b8e..9b8b54e6a17e81c7012386331d70ec8c904db271 100644 --- a/gitlab-known-hosts +++ b/gitlab-known-hosts @@ -1,3 +1,6 @@ [gitlab.freifunk-stuttgart.de]:22220 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGNCe5DNM3hGY+oEy5JeGjCDg68YrpjFivgxIAuFvhJkRdPPQpnOURuXFt/wQ0PCF/MZHVLPKwSLEfI3pkQRAg2bLyXFnLMlaaC2Q+9eZoQ6K2+NFWlKiVd3EmYGMt2USFfgFiHKeA4NNhvqtINj5pk1usFRCuUYfAegIVQl+vIvW7rpdK68Y33MGPrP81XD0E7TpasQnqnxVIaTe+QG3oNlPCToE6e8sZij3lwKGmR0gopbvUjXjuY7SCIbzEwzNET+olVfVHWMlDwuzM8tUOSbOSg6mX+I1gTJXndxdGl/dSsI9HXAe1HAa3B7zN+SDwcz+ySxsAgS8loyJMT2SD [gitlab.freifunk-stuttgart.de]:22220 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJPXKTRXP1BULVuiWD92F3VdNDLkNV3B7Dv7hb9/PVsCVZnH+s6lsdqYZZL/7QvzyqB/eOlXRs5PE/opGkS84Qw= [gitlab.freifunk-stuttgart.de]:22220 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCt1kYnQIF17lAw7kRBAZOJFOS67ZQpBPsq79srBpwu +[ssh.gitlab.freifunk-stuttgart.de]:22220 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGNCe5DNM3hGY+oEy5JeGjCDg68YrpjFivgxIAuFvhJkRdPPQpnOURuXFt/wQ0PCF/MZHVLPKwSLEfI3pkQRAg2bLyXFnLMlaaC2Q+9eZoQ6K2+NFWlKiVd3EmYGMt2USFfgFiHKeA4NNhvqtINj5pk1usFRCuUYfAegIVQl+vIvW7rpdK68Y33MGPrP81XD0E7TpasQnqnxVIaTe+QG3oNlPCToE6e8sZij3lwKGmR0gopbvUjXjuY7SCIbzEwzNET+olVfVHWMlDwuzM8tUOSbOSg6mX+I1gTJXndxdGl/dSsI9HXAe1HAa3B7zN+SDwcz+ySxsAgS8loyJMT2SD +[ssh.gitlab.freifunk-stuttgart.de]:22220 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJPXKTRXP1BULVuiWD92F3VdNDLkNV3B7Dv7hb9/PVsCVZnH+s6lsdqYZZL/7QvzyqB/eOlXRs5PE/opGkS84Qw= +[ssh.gitlab.freifunk-stuttgart.de]:22220 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCt1kYnQIF17lAw7kRBAZOJFOS67ZQpBPsq79srBpwu diff --git a/update-gluon-experimental.sh b/update-gluon-experimental.sh index ccc5b50389929d551f673003a68855541b8e7b6b..a16823d27ffc7d629eb62581803550fb811cd784 100755 --- a/update-gluon-experimental.sh +++ b/update-gluon-experimental.sh @@ -4,9 +4,9 @@ set -x set -eu set -o pipefail -gluon_fork_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/gluon.git" +gluon_fork_git_url="ssh://git@ssh.gitlab.freifunk-stuttgart.de:22220/firmware/gluon.git" gluon_upstream_git_url="https://github.com/freifunk-gluon/gluon.git" -site_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/site-ffs.git" +site_git_url="ssh://git@ssh.gitlab.freifunk-stuttgart.de:22220/firmware/site-ffs.git" git clone "$gluon_fork_git_url" gluon cd gluon diff --git a/update-gluon.sh b/update-gluon.sh index f3b3be400d0a6e30ff5a7f40da8c893ea307275e..b7448dd6a0e5c870c47397d61a7e042d8590ac7b 100755 --- a/update-gluon.sh +++ b/update-gluon.sh @@ -7,9 +7,9 @@ set -o pipefail gluon_major="v2021.1" site_branch="v2.4" -gluon_fork_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/gluon.git" +gluon_fork_git_url="ssh://git@ssh.gitlab.freifunk-stuttgart.de:22220/firmware/gluon.git" gluon_upstream_git_url="https://github.com/freifunk-gluon/gluon.git" -site_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/site-ffs.git" +site_git_url="ssh://git@ssh.gitlab.freifunk-stuttgart.de:22220/firmware/site-ffs.git" upstream_newest_minor=$(git ls-remote --tags --refs "$gluon_upstream_git_url" "refs/tags/$gluon_major*" | cut -d/ -f3 | sort -r -n -t. -k2 | head -n1) # branch name in our forked gluon