diff --git a/knotserver-git/.SRCINFO b/knotserver-git/.SRCINFO index b6e7345..421cab5 100644 --- a/knotserver-git/.SRCINFO +++ b/knotserver-git/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = knotserver-git pkgdesc = git collaboration platform built on ATproto - pkgver = 1.2.1.alpha.r1.gf44471b + pkgver = 1.2.1.alpha.r74.g4d5576b pkgrel = 1 url = https://tangled.sh/@tangled.sh/core install = knotserver.install @@ -16,7 +16,7 @@ pkgbase = knotserver-git source = knotserver-tmpfiles.conf sha256sums = SKIP sha256sums = 8d243e1bc0d2e51079550929019d18811679127e6af6aabeed60cd907ffaab32 - sha256sums = 8b121f30276d83ca52f793e708731fd6985118a2ff2105cd3f603523dc11d8d8 + sha256sums = 7201f3f71b4282a99903b481a5d9ab4a26b2b305de8f0c6980570edd8de7137e sha256sums = 30d0b9df2419c22f930649273e006faa1bdab740f03c47d740c941db45dc951e pkgname = knotserver-git diff --git a/knotserver-git/PKGBUILD b/knotserver-git/PKGBUILD index 05db8c4..75c7ad4 100644 --- a/knotserver-git/PKGBUILD +++ b/knotserver-git/PKGBUILD @@ -17,7 +17,7 @@ source=("tangled::git+$url" ${_pkgname}-tmpfiles.conf) sha256sums=('SKIP' '8d243e1bc0d2e51079550929019d18811679127e6af6aabeed60cd907ffaab32' - '8b121f30276d83ca52f793e708731fd6985118a2ff2105cd3f603523dc11d8d8' + '7201f3f71b4282a99903b481a5d9ab4a26b2b305de8f0c6980570edd8de7137e' '30d0b9df2419c22f930649273e006faa1bdab740f03c47d740c941db45dc951e') pkgver() { diff --git a/knotserver-git/knotserver-sshd.conf b/knotserver-git/knotserver-sshd.conf index 71e20ab..e3d751a 100644 --- a/knotserver-git/knotserver-sshd.conf +++ b/knotserver-git/knotserver-sshd.conf @@ -1,3 +1,3 @@ Match User git - AuthorizedKeysCommand /usr/bin/keyfetch -git-path /var/lib/tangled -repoguard-path /usr/bin/repoguard -log-path /var/log/knotserver/keyfetch.log + AuthorizedKeysCommand /usr/bin/keyfetch -git-dir /var/lib/tangled -repoguard-path /usr/bin/repoguard -log-path /var/log/knotserver/keyfetch.log AuthorizedKeysCommandUser nobody diff --git a/knotserver/.SRCINFO b/knotserver/.SRCINFO index ca624bb..2d7ae24 100644 --- a/knotserver/.SRCINFO +++ b/knotserver/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = knotserver pkgdesc = git collaboration platform built on ATproto pkgver = 1.2.1.alpha - pkgrel = 1 + pkgrel = 2 url = https://tangled.sh/@tangled.sh/core install = knotserver.install arch = x86_64 @@ -17,7 +17,7 @@ pkgbase = knotserver source = knotserver-tmpfiles.conf sha256sums = 8589fec78fbb58d3ab2d8c755c29ec2d70a49a1eb61b86e563e15a2541b4b1b4 sha256sums = 8d243e1bc0d2e51079550929019d18811679127e6af6aabeed60cd907ffaab32 - sha256sums = 8b121f30276d83ca52f793e708731fd6985118a2ff2105cd3f603523dc11d8d8 + sha256sums = 7201f3f71b4282a99903b481a5d9ab4a26b2b305de8f0c6980570edd8de7137e sha256sums = 30d0b9df2419c22f930649273e006faa1bdab740f03c47d740c941db45dc951e pkgname = knotserver diff --git a/knotserver/PKGBUILD b/knotserver/PKGBUILD index 68d98da..cb7c229 100644 --- a/knotserver/PKGBUILD +++ b/knotserver/PKGBUILD @@ -18,7 +18,7 @@ source=("tangled::git+$url#tag=v$_pkgver" ${_pkgname}-tmpfiles.conf) sha256sums=('8589fec78fbb58d3ab2d8c755c29ec2d70a49a1eb61b86e563e15a2541b4b1b4' '8d243e1bc0d2e51079550929019d18811679127e6af6aabeed60cd907ffaab32' - '8b121f30276d83ca52f793e708731fd6985118a2ff2105cd3f603523dc11d8d8' + '7201f3f71b4282a99903b481a5d9ab4a26b2b305de8f0c6980570edd8de7137e' '30d0b9df2419c22f930649273e006faa1bdab740f03c47d740c941db45dc951e') build() { diff --git a/knotserver/knotserver-sshd.conf b/knotserver/knotserver-sshd.conf index 71e20ab..e3d751a 100644 --- a/knotserver/knotserver-sshd.conf +++ b/knotserver/knotserver-sshd.conf @@ -1,3 +1,3 @@ Match User git - AuthorizedKeysCommand /usr/bin/keyfetch -git-path /var/lib/tangled -repoguard-path /usr/bin/repoguard -log-path /var/log/knotserver/keyfetch.log + AuthorizedKeysCommand /usr/bin/keyfetch -git-dir /var/lib/tangled -repoguard-path /usr/bin/repoguard -log-path /var/log/knotserver/keyfetch.log AuthorizedKeysCommandUser nobody diff --git a/src/common/sshd.conf.sh b/src/common/sshd.conf.sh index 6d49e9d..6743aef 100755 --- a/src/common/sshd.conf.sh +++ b/src/common/sshd.conf.sh @@ -1,6 +1,6 @@ #!/usr/bin/bash cat << EOF > ${pkgbuild_path}/knotserver-sshd.conf Match User $knotserver_user - AuthorizedKeysCommand /usr/bin/keyfetch -git-path $knotserver_repo_path -repoguard-path /usr/bin/repoguard -log-path ${knotserver_log_directory}/keyfetch.log + AuthorizedKeysCommand /usr/bin/keyfetch -git-dir $knotserver_repo_path -repoguard-path /usr/bin/repoguard -log-path ${knotserver_log_directory}/keyfetch.log AuthorizedKeysCommandUser nobody EOF