update to unified knot cli and v1.4.0-alpha

README.md

···
 
 ### [appview](appview)
 
-Builds `appview` from tag [v1.3.0-alpha](https://tangled.sh/@tangled.sh/core/tree/v1.3.0-alpha).
+Builds `appview` from tag [v1.4.0-alpha](https://tangled.sh/@tangled.sh/core/tree/v1.4.0-alpha).
 
 ### [knotserver](knotserver)
 
-Builds `knotserver`, `keyfetch`, and `repoguard` from tag [v1.3.0-alpha](https://tangled.sh/@tangled.sh/core/tree/v1.3.0-alpha).
+Builds `knot` from tag [v1.4.0-alpha](https://tangled.sh/@tangled.sh/core/tree/v1.4.0-alpha).
 
 ### [knotserver-git](knotserver-git)
 
-Builds `knotserver`, `keyfetch`, and `repoguard` from branch [master](https://tangled.sh/@tangled.sh/core/tree/master).
+Builds `knot` from branch [master](https://tangled.sh/@tangled.sh/core/tree/master).
 

conf.sh

···
-tag=1.3.0-alpha
+tag=1.4.0-alpha
 knotserver_user=git
 knotserver_group=git
 knotserver_path=/var/lib/tangled

knotserver-git/.SRCINFO

···
 pkgbase = knotserver-git
 	pkgdesc = git collaboration platform built on ATproto
-	pkgver = 1.3.0.alpha.r48.gd4332d6
+	pkgver = 1.4.0.alpha.r1.g9b2e136
 	pkgrel = 1
 	url = https://tangled.sh/@tangled.sh/core
 	install = knotserver.install
···
 	depends = git
 	conflicts = knotserver
 	options = strip
-	source = tangled::git+https://tangled.sh/@tangled.sh/core
+	source = tangled::git+https://tangled.sh/@tangled.sh/core#branch=master
 	source = knotserver.service
 	source = knotserver-sshd.conf
 	source = knotserver-tmpfiles.conf
 	sha256sums = SKIP
-	sha256sums = e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6
-	sha256sums = 0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37
+	sha256sums = 8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5
+	sha256sums = 933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491
 	sha256sums = cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171
 
 pkgname = knotserver-git

knotserver-git/PKGBUILD

···
 _pkgname=knotserver
 pkgname=${_pkgname}-git
 pkgdesc='git collaboration platform built on ATproto'
-pkgver=1.3.0.alpha.r48.gd4332d6
+pkgver=1.4.0.alpha.r1.g9b2e136
 pkgrel=1
 license=(MIT)
 arch=(x86_64)
···
 makedepends=(go)
 options=(strip)
 install=${_pkgname}.install
-source=("tangled::git+$url"
+source=("tangled::git+$url#branch=master"
 		${_pkgname}.service
 		${_pkgname}-sshd.conf
 		${_pkgname}-tmpfiles.conf)
 sha256sums=('SKIP'
-            'e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6'
-            '0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37'
+            '8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5'
+            '933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491'
             'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171')
 
 pkgver() {
···
 	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
 
 	cd ${srcdir}/tangled
-	go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=${pkgver}" -o "${srcdir}/build/knotserver" ./cmd/knotserver
-	go build -o "${srcdir}/build/repoguard" ./cmd/repoguard
-	go build -o "${srcdir}/build/keyfetch" ./cmd/keyfetch
+	go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=${pkgver}" -o "${srcdir}/build/knot" ./cmd/knot
 }
 
 package() {
 	install -Dm644 "${srcdir}/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
 	install -Dm644 "${srcdir}/${_pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf"
 	install -Dm644 "${srcdir}/${_pkgname}-sshd.conf" "${pkgdir}/usr/lib/systemd/sshd_config.d/${_pkgname}.conf"
-	install -Dm755 "${srcdir}/build/knotserver" "${pkgdir}/usr/bin/knotserver"
-	install -Dm755 "${srcdir}/build/repoguard" "${pkgdir}/usr/bin/repoguard"
-	install -Dm755 "${srcdir}/build/keyfetch" "${pkgdir}/usr/bin/keyfetch"
+	install -Dm755 "${srcdir}/build/knot" "${pkgdir}/usr/bin/knot"
 	install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE"
 }

knotserver-git/README.md

···
+# knotserver-git
+
+Builds and packages `knot`.
+
+When installed, knotserver's database files will be stored in `/var/lib/tangled`. Repositories will
+be stored in `/var/lib/tangled/repositories`.
+
+## SSH
+
+SSH access is required to push to repositories. To enable, use the sshd_config.d drop-in, and give the
+`git` user a shell and a home directory:
+
+```bash
+ln -s /usr/lib/systemd/sshd_config.d/knotserver.conf /etc/ssh/sshd_config.d/30-knotserver.conf
+usermod -s /usr/bin/bash -d /var/lib/tangled/repositories git
+```
+

knotserver-git/knotserver-sshd.conf

···
 Match User git
-  AuthorizedKeysCommand /usr/bin/keyfetch -git-dir /var/lib/tangled/repositories -repoguard-path /usr/bin/repoguard -log-path /var/log/knotserver/keyfetch.log
+  AuthorizedKeysCommand /usr/bin/knot keys -output authorized-keys -git-dir /var/lib/tangled/repositories -log-path /var/log/knotserver/keyfetch.log
   AuthorizedKeysCommandUser nobody

knotserver-git/knotserver.service

···
 EnvironmentFile=-/etc/tangled/knotserver
 
 WorkingDirectory=/var/lib/tangled
-ExecStart=/usr/bin/knotserver
+ExecStart=/usr/bin/knot server
 Restart=always
 User=git
 Group=git

knotserver/.SRCINFO

···
 pkgbase = knotserver
 	pkgdesc = git collaboration platform built on ATproto
-	pkgver = 1.3.0.alpha
+	pkgver = 1.4.0.alpha
 	pkgrel = 1
 	url = https://tangled.sh/@tangled.sh/core
 	install = knotserver.install
···
 	conflicts = knotserver-git
 	options = strip
 	options = !debug
-	source = tangled::git+https://tangled.sh/@tangled.sh/core#tag=v1.3.0-alpha
+	source = tangled::git+https://tangled.sh/@tangled.sh/core#tag=v1.4.0-alpha
 	source = knotserver.service
 	source = knotserver-sshd.conf
 	source = knotserver-tmpfiles.conf
-	sha256sums = 790dfc1fb65dfc6db973f411a65088f865325f548f24ac1358fd65a52eaa0eee
-	sha256sums = e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6
-	sha256sums = 0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37
+	sha256sums = fa7727cd28ba1d0fb712f7a3b37260eea5d863abeac53f69d51831e596aa9c32
+	sha256sums = 8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5
+	sha256sums = 933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491
 	sha256sums = cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171
 
 pkgname = knotserver

knotserver/PKGBUILD

···
 _pkgname=knotserver
-_pkgver=1.3.0-alpha
+_pkgver=1.4.0-alpha
 pkgname=${_pkgname/\-/\.}
 pkgdesc='git collaboration platform built on ATproto'
 pkgver=${_pkgver/\-/\.}
···
 		${_pkgname}.service
 		${_pkgname}-sshd.conf
 		${_pkgname}-tmpfiles.conf)
-sha256sums=('790dfc1fb65dfc6db973f411a65088f865325f548f24ac1358fd65a52eaa0eee'
-            'e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6'
-            '0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37'
+sha256sums=('fa7727cd28ba1d0fb712f7a3b37260eea5d863abeac53f69d51831e596aa9c32'
+            '8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5'
+            '933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491'
             'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171')
 
 build() {
···
 	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
 
 	cd ${srcdir}/tangled
-	go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=${_pkgver}" -o "${srcdir}/build/knotserver" ./cmd/knotserver
-	go build -o "${srcdir}/build/repoguard" ./cmd/repoguard
-	go build -o "${srcdir}/build/keyfetch" ./cmd/keyfetch
+	go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=${_pkgver}" -o "${srcdir}/build/knot" ./cmd/knot
 }
 
 package() {
 	install -Dm644 "${srcdir}/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
-	install -Dm644 "${srcdir}/${_pkgname}-tmpfiles.conf" "$\{pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf"
+	install -Dm644 "${srcdir}/${_pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf"
 	install -Dm644 "${srcdir}/${_pkgname}-sshd.conf" "${pkgdir}/usr/lib/systemd/sshd_config.d/${_pkgname}.conf"
-	install -Dm755 "${srcdir}/build/knotserver" "${pkgdir}/usr/bin/knotserver"
-	install -Dm755 "${srcdir}/build/repoguard" "${pkgdir}/usr/bin/repoguard"
-	install -Dm755 "${srcdir}/build/keyfetch" "${pkgdir}/usr/bin/keyfetch"
+	install -Dm755 "${srcdir}/build/knot" "${pkgdir}/usr/bin/knot"
 	install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE"
 }

knotserver/README.md

···
 # knotserver
 
-Builds and packages `knotserver`, `keyfetch`, and `repoguard`.
+Builds and packages `knot`.
 
 When installed, knotserver's database files will be stored in `/var/lib/tangled`. Repositories will
-be stored in `/var/lib/tangled/repositories`. 
+be stored in `/var/lib/tangled/repositories`.
 
 ## SSH
 

knotserver/knotserver-sshd.conf

···
 Match User git
-  AuthorizedKeysCommand /usr/bin/keyfetch -git-dir /var/lib/tangled/repositories -repoguard-path /usr/bin/repoguard -log-path /var/log/knotserver/keyfetch.log
+  AuthorizedKeysCommand /usr/bin/knot keys -output authorized-keys -git-dir /var/lib/tangled/repositories -log-path /var/log/knotserver/keyfetch.log
   AuthorizedKeysCommandUser nobody

knotserver/knotserver.service

···
 EnvironmentFile=-/etc/tangled/knotserver
 
 WorkingDirectory=/var/lib/tangled
-ExecStart=/usr/bin/knotserver
+ExecStart=/usr/bin/knot server
 Restart=always
 User=git
 Group=git

src/README.md.sh

···
 
 ### [knotserver](knotserver)
 
-Builds \`knotserver\`, \`keyfetch\`, and \`repoguard\` from tag [v${tag}](https://tangled.sh/@tangled.sh/core/tree/v${tag}).
+Builds \`knot\` from tag [v${tag}](https://tangled.sh/@tangled.sh/core/tree/v${tag}).
 
 ### [knotserver-git](knotserver-git)
 
-Builds \`knotserver\`, \`keyfetch\`, and \`repoguard\` from branch [master](https://tangled.sh/@tangled.sh/core/tree/master).
+Builds \`knot\` from branch [master](https://tangled.sh/@tangled.sh/core/tree/master).
 
 EOF

src/common/service.sh

···
 EnvironmentFile=-/etc/tangled/knotserver
 
 WorkingDirectory=${knotserver_path:-/var/lib/tangled}
-ExecStart=/usr/bin/knotserver
+ExecStart=/usr/bin/knot server
 Restart=always
 User=${knotserver_user:-git}
 Group=${knotserver_group:-git}

src/common/sshd.conf.sh

···
 #!/usr/bin/bash
 cat << EOF > ${pkgbuild_path}/knotserver-sshd.conf
 Match User ${knotserver_user:-git}
-  AuthorizedKeysCommand /usr/bin/keyfetch -git-dir ${knotserver_repo_path:-/var/lib/tangled/repositories} -repoguard-path /usr/bin/repoguard -log-path ${knotserver_log_directory:-/var/log/knotserver}/keyfetch.log
+  AuthorizedKeysCommand /usr/bin/knot keys -output authorized-keys -git-dir ${knotserver_repo_path:-/var/lib/tangled/repositories} -log-path ${knotserver_log_directory:-/var/log/knotserver}/keyfetch.log
   AuthorizedKeysCommandUser nobody
 EOF

src/knotserver-git/README.md.sh

···
+#!/usr/bin/bash
+cat << EOF > ${pkgbuild_path}/README.md
+# knotserver-git
+
+Builds and packages \`knot\`.
+
+When installed, knotserver's database files will be stored in \`${knotserver_path}\`. Repositories will
+be stored in \`${knotserver_repo_path}\`.
+
+## SSH
+
+SSH access is required to push to repositories. To enable, use the sshd_config.d drop-in, and give the
+\`${knotserver_user:-git}\` user a shell and a home directory:
+
+\`\`\`bash
+ln -s /usr/lib/systemd/sshd_config.d/knotserver.conf /etc/ssh/sshd_config.d/30-knotserver.conf
+usermod -s /usr/bin/bash -d ${knotserver_repo_path} ${knotserver_user:-git}
+\`\`\`
+
+EOF

src/knotserver/PKGBUILD.sh

···
 	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
 
 	cd \${srcdir}/tangled
-	go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=\${_pkgver}" -o "\${srcdir}/build/knotserver" ./cmd/knotserver
-	go build -o "\${srcdir}/build/repoguard" ./cmd/repoguard
-	go build -o "\${srcdir}/build/keyfetch" ./cmd/keyfetch
+	go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=\${_pkgver}" -o "\${srcdir}/build/knot" ./cmd/knot
 }
 
 package() {
 	install -Dm644 "\${srcdir}/\${_pkgname}.service" "\${pkgdir}/usr/lib/systemd/system/\${_pkgname}.service"
-	install -Dm644 "\${srcdir}/\${_pkgname}-tmpfiles.conf" "$\{pkgdir}/usr/lib/tmpfiles.d/\${_pkgname}.conf"
+	install -Dm644 "\${srcdir}/\${_pkgname}-tmpfiles.conf" "\${pkgdir}/usr/lib/tmpfiles.d/\${_pkgname}.conf"
 	install -Dm644 "\${srcdir}/\${_pkgname}-sshd.conf" "\${pkgdir}/usr/lib/systemd/sshd_config.d/\${_pkgname}.conf"
-	install -Dm755 "\${srcdir}/build/knotserver" "\${pkgdir}/usr/bin/knotserver"
-	install -Dm755 "\${srcdir}/build/repoguard" "\${pkgdir}/usr/bin/repoguard"
-	install -Dm755 "\${srcdir}/build/keyfetch" "\${pkgdir}/usr/bin/keyfetch"
+	install -Dm755 "\${srcdir}/build/knot" "\${pkgdir}/usr/bin/knot"
 	install -Dm644 "\${srcdir}/tangled/license" "\${pkgdir}/usr/share/licenses/tangled/LICENSE"
 }
 EOF

src/knotserver/README.md.sh

···
 cat << EOF > ${pkgbuild_path}/README.md
 # knotserver
 
-Builds and packages \`knotserver\`, \`keyfetch\`, and \`repoguard\`.
+Builds and packages \`knot\`.
 
 When installed, knotserver's database files will be stored in \`${knotserver_path}\`. Repositories will
-be stored in \`${knotserver_repo_path}\`. 
+be stored in \`${knotserver_repo_path}\`.
 
 ## SSH
 

update.sh

···
 source src/README.md.sh
 
 for pkgbuild_path in knotserver knotserver-git; do
-  source src/common/sshd.conf.sh
-  source src/common/tmpfiles.conf.sh
-  source src/common/service.sh
-  source src/common/install.sh
+  for src in src/common/*.sh; do
+    source ${src}
+  done
   for src in src/${pkgbuild_path}/*.sh; do
     source ${src}
   done