+3 -3

README.md

··· 11 11 12 12 ### [appview](appview) 13 13 14 14 - Builds `appview` from tag [v1.3.0-alpha](https://tangled.sh/@tangled.sh/core/tree/v1.3.0-alpha). 14 14 + Builds `appview` from tag [v1.4.0-alpha](https://tangled.sh/@tangled.sh/core/tree/v1.4.0-alpha). 15 15 16 16 ### [knotserver](knotserver) 17 17 18 18 - Builds `knotserver`, `keyfetch`, and `repoguard` from tag [v1.3.0-alpha](https://tangled.sh/@tangled.sh/core/tree/v1.3.0-alpha). 18 18 + Builds `knot` from tag [v1.4.0-alpha](https://tangled.sh/@tangled.sh/core/tree/v1.4.0-alpha). 19 19 20 20 ### [knotserver-git](knotserver-git) 21 21 22 22 - Builds `knotserver`, `keyfetch`, and `repoguard` from branch [master](https://tangled.sh/@tangled.sh/core/tree/master). 22 22 + Builds `knot` from branch [master](https://tangled.sh/@tangled.sh/core/tree/master). 23 23

+1 -1

conf.sh

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

+4 -4

knotserver-git/.SRCINFO

··· 1 1 pkgbase = knotserver-git 2 2 pkgdesc = git collaboration platform built on ATproto 3 3 - pkgver = 1.3.0.alpha.r48.gd4332d6 3 3 + pkgver = 1.4.0.alpha.r1.g9b2e136 4 4 pkgrel = 1 5 5 url = https://tangled.sh/@tangled.sh/core 6 6 install = knotserver.install ··· 10 10 depends = git 11 11 conflicts = knotserver 12 12 options = strip 13 13 - source = tangled::git+https://tangled.sh/@tangled.sh/core 13 13 + source = tangled::git+https://tangled.sh/@tangled.sh/core#branch=master 14 14 source = knotserver.service 15 15 source = knotserver-sshd.conf 16 16 source = knotserver-tmpfiles.conf 17 17 sha256sums = SKIP 18 18 - sha256sums = e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6 19 19 - sha256sums = 0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37 18 18 + sha256sums = 8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5 19 19 + sha256sums = 933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491 20 20 sha256sums = cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171 21 21 22 22 pkgname = knotserver-git

+6 -10

knotserver-git/PKGBUILD

··· 1 1 _pkgname=knotserver 2 2 pkgname=${_pkgname}-git 3 3 pkgdesc='git collaboration platform built on ATproto' 4 4 - pkgver=1.3.0.alpha.r48.gd4332d6 4 4 + pkgver=1.4.0.alpha.r1.g9b2e136 5 5 pkgrel=1 6 6 license=(MIT) 7 7 arch=(x86_64) ··· 11 11 makedepends=(go) 12 12 options=(strip) 13 13 install=${_pkgname}.install 14 14 - source=("tangled::git+$url" 14 14 + source=("tangled::git+$url#branch=master" 15 15 ${_pkgname}.service 16 16 ${_pkgname}-sshd.conf 17 17 ${_pkgname}-tmpfiles.conf) 18 18 sha256sums=('SKIP' 19 19 - 'e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6' 20 20 - '0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37' 19 19 + '8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5' 20 20 + '933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491' 21 21 'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171') 22 22 23 23 pkgver() { ··· 36 36 export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" 37 37 38 38 cd ${srcdir}/tangled 39 39 - go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=${pkgver}" -o "${srcdir}/build/knotserver" ./cmd/knotserver 40 40 - go build -o "${srcdir}/build/repoguard" ./cmd/repoguard 41 41 - go build -o "${srcdir}/build/keyfetch" ./cmd/keyfetch 39 39 + go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=${pkgver}" -o "${srcdir}/build/knot" ./cmd/knot 42 40 } 43 41 44 42 package() { 45 43 install -Dm644 "${srcdir}/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service" 46 44 install -Dm644 "${srcdir}/${_pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf" 47 45 install -Dm644 "${srcdir}/${_pkgname}-sshd.conf" "${pkgdir}/usr/lib/systemd/sshd_config.d/${_pkgname}.conf" 48 48 - install -Dm755 "${srcdir}/build/knotserver" "${pkgdir}/usr/bin/knotserver" 49 49 - install -Dm755 "${srcdir}/build/repoguard" "${pkgdir}/usr/bin/repoguard" 50 50 - install -Dm755 "${srcdir}/build/keyfetch" "${pkgdir}/usr/bin/keyfetch" 46 46 + install -Dm755 "${srcdir}/build/knot" "${pkgdir}/usr/bin/knot" 51 47 install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE" 52 48 }

+17

knotserver-git/README.md

··· 1 1 + # knotserver-git 2 2 + 3 3 + Builds and packages `knot`. 4 4 + 5 5 + When installed, knotserver's database files will be stored in `/var/lib/tangled`. Repositories will 6 6 + be stored in `/var/lib/tangled/repositories`. 7 7 + 8 8 + ## SSH 9 9 + 10 10 + SSH access is required to push to repositories. To enable, use the sshd_config.d drop-in, and give the 11 11 + `git` user a shell and a home directory: 12 12 + 13 13 + ```bash 14 14 + ln -s /usr/lib/systemd/sshd_config.d/knotserver.conf /etc/ssh/sshd_config.d/30-knotserver.conf 15 15 + usermod -s /usr/bin/bash -d /var/lib/tangled/repositories git 16 16 + ``` 17 17 +

+1 -1

knotserver-git/knotserver-sshd.conf

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

+1 -1

knotserver-git/knotserver.service

··· 12 12 EnvironmentFile=-/etc/tangled/knotserver 13 13 14 14 WorkingDirectory=/var/lib/tangled 15 15 - ExecStart=/usr/bin/knotserver 15 15 + ExecStart=/usr/bin/knot server 16 16 Restart=always 17 17 User=git 18 18 Group=git

+5 -5

knotserver/.SRCINFO

··· 1 1 pkgbase = knotserver 2 2 pkgdesc = git collaboration platform built on ATproto 3 3 - pkgver = 1.3.0.alpha 3 3 + pkgver = 1.4.0.alpha 4 4 pkgrel = 1 5 5 url = https://tangled.sh/@tangled.sh/core 6 6 install = knotserver.install ··· 11 11 conflicts = knotserver-git 12 12 options = strip 13 13 options = !debug 14 14 - source = tangled::git+https://tangled.sh/@tangled.sh/core#tag=v1.3.0-alpha 14 14 + source = tangled::git+https://tangled.sh/@tangled.sh/core#tag=v1.4.0-alpha 15 15 source = knotserver.service 16 16 source = knotserver-sshd.conf 17 17 source = knotserver-tmpfiles.conf 18 18 - sha256sums = 790dfc1fb65dfc6db973f411a65088f865325f548f24ac1358fd65a52eaa0eee 19 19 - sha256sums = e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6 20 20 - sha256sums = 0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37 18 18 + sha256sums = fa7727cd28ba1d0fb712f7a3b37260eea5d863abeac53f69d51831e596aa9c32 19 19 + sha256sums = 8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5 20 20 + sha256sums = 933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491 21 21 sha256sums = cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171 22 22 23 23 pkgname = knotserver

+7 -11

knotserver/PKGBUILD

··· 1 1 _pkgname=knotserver 2 2 - _pkgver=1.3.0-alpha 2 2 + _pkgver=1.4.0-alpha 3 3 pkgname=${_pkgname/\-/\.} 4 4 pkgdesc='git collaboration platform built on ATproto' 5 5 pkgver=${_pkgver/\-/\.} ··· 16 16 ${_pkgname}.service 17 17 ${_pkgname}-sshd.conf 18 18 ${_pkgname}-tmpfiles.conf) 19 19 - sha256sums=('790dfc1fb65dfc6db973f411a65088f865325f548f24ac1358fd65a52eaa0eee' 20 20 - 'e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6' 21 21 - '0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37' 19 19 + sha256sums=('fa7727cd28ba1d0fb712f7a3b37260eea5d863abeac53f69d51831e596aa9c32' 20 20 + '8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5' 21 21 + '933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491' 22 22 'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171') 23 23 24 24 build() { ··· 32 32 export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" 33 33 34 34 cd ${srcdir}/tangled 35 35 - go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=${_pkgver}" -o "${srcdir}/build/knotserver" ./cmd/knotserver 36 36 - go build -o "${srcdir}/build/repoguard" ./cmd/repoguard 37 37 - go build -o "${srcdir}/build/keyfetch" ./cmd/keyfetch 35 35 + go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=${_pkgver}" -o "${srcdir}/build/knot" ./cmd/knot 38 36 } 39 37 40 38 package() { 41 39 install -Dm644 "${srcdir}/${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service" 42 42 - install -Dm644 "${srcdir}/${_pkgname}-tmpfiles.conf" "$\{pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf" 40 40 + install -Dm644 "${srcdir}/${_pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf" 43 41 install -Dm644 "${srcdir}/${_pkgname}-sshd.conf" "${pkgdir}/usr/lib/systemd/sshd_config.d/${_pkgname}.conf" 44 44 - install -Dm755 "${srcdir}/build/knotserver" "${pkgdir}/usr/bin/knotserver" 45 45 - install -Dm755 "${srcdir}/build/repoguard" "${pkgdir}/usr/bin/repoguard" 46 46 - install -Dm755 "${srcdir}/build/keyfetch" "${pkgdir}/usr/bin/keyfetch" 42 42 + install -Dm755 "${srcdir}/build/knot" "${pkgdir}/usr/bin/knot" 47 43 install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE" 48 44 }

+2 -2

knotserver/README.md

··· 1 1 # knotserver 2 2 3 3 - Builds and packages `knotserver`, `keyfetch`, and `repoguard`. 3 3 + Builds and packages `knot`. 4 4 5 5 When installed, knotserver's database files will be stored in `/var/lib/tangled`. Repositories will 6 6 - be stored in `/var/lib/tangled/repositories`. 6 6 + be stored in `/var/lib/tangled/repositories`. 7 7 8 8 ## SSH 9 9

+1 -1

knotserver/knotserver-sshd.conf

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

+1 -1

knotserver/knotserver.service

··· 12 12 EnvironmentFile=-/etc/tangled/knotserver 13 13 14 14 WorkingDirectory=/var/lib/tangled 15 15 - ExecStart=/usr/bin/knotserver 15 15 + ExecStart=/usr/bin/knot server 16 16 Restart=always 17 17 User=git 18 18 Group=git

+2 -2

src/README.md.sh

··· 17 17 18 18 ### [knotserver](knotserver) 19 19 20 20 - Builds \`knotserver\`, \`keyfetch\`, and \`repoguard\` from tag [v${tag}](https://tangled.sh/@tangled.sh/core/tree/v${tag}). 20 20 + Builds \`knot\` from tag [v${tag}](https://tangled.sh/@tangled.sh/core/tree/v${tag}). 21 21 22 22 ### [knotserver-git](knotserver-git) 23 23 24 24 - Builds \`knotserver\`, \`keyfetch\`, and \`repoguard\` from branch [master](https://tangled.sh/@tangled.sh/core/tree/master). 24 24 + Builds \`knot\` from branch [master](https://tangled.sh/@tangled.sh/core/tree/master). 25 25 26 26 EOF

+1 -1

src/common/service.sh

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

+1 -1

src/common/sshd.conf.sh

··· 1 1 #!/usr/bin/bash 2 2 cat << EOF > ${pkgbuild_path}/knotserver-sshd.conf 3 3 Match User ${knotserver_user:-git} 4 4 - 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 4 4 + 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 5 5 AuthorizedKeysCommandUser nobody 6 6 EOF

+20

src/knotserver-git/README.md.sh

··· 1 1 + #!/usr/bin/bash 2 2 + cat << EOF > ${pkgbuild_path}/README.md 3 3 + # knotserver-git 4 4 + 5 5 + Builds and packages \`knot\`. 6 6 + 7 7 + When installed, knotserver's database files will be stored in \`${knotserver_path}\`. Repositories will 8 8 + be stored in \`${knotserver_repo_path}\`. 9 9 + 10 10 + ## SSH 11 11 + 12 12 + SSH access is required to push to repositories. To enable, use the sshd_config.d drop-in, and give the 13 13 + \`${knotserver_user:-git}\` user a shell and a home directory: 14 14 + 15 15 + \`\`\`bash 16 16 + ln -s /usr/lib/systemd/sshd_config.d/knotserver.conf /etc/ssh/sshd_config.d/30-knotserver.conf 17 17 + usermod -s /usr/bin/bash -d ${knotserver_repo_path} ${knotserver_user:-git} 18 18 + \`\`\` 19 19 + 20 20 + EOF

+3 -7

src/knotserver/PKGBUILD.sh

··· 34 34 export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" 35 35 36 36 cd \${srcdir}/tangled 37 37 - go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=\${_pkgver}" -o "\${srcdir}/build/knotserver" ./cmd/knotserver 38 38 - go build -o "\${srcdir}/build/repoguard" ./cmd/repoguard 39 39 - go build -o "\${srcdir}/build/keyfetch" ./cmd/keyfetch 37 37 + go build -ldflags "-X tangled.sh/tangled.sh/core/knotserver.version=\${_pkgver}" -o "\${srcdir}/build/knot" ./cmd/knot 40 38 } 41 39 42 40 package() { 43 41 install -Dm644 "\${srcdir}/\${_pkgname}.service" "\${pkgdir}/usr/lib/systemd/system/\${_pkgname}.service" 44 44 - install -Dm644 "\${srcdir}/\${_pkgname}-tmpfiles.conf" "$\{pkgdir}/usr/lib/tmpfiles.d/\${_pkgname}.conf" 42 42 + install -Dm644 "\${srcdir}/\${_pkgname}-tmpfiles.conf" "\${pkgdir}/usr/lib/tmpfiles.d/\${_pkgname}.conf" 45 43 install -Dm644 "\${srcdir}/\${_pkgname}-sshd.conf" "\${pkgdir}/usr/lib/systemd/sshd_config.d/\${_pkgname}.conf" 46 46 - install -Dm755 "\${srcdir}/build/knotserver" "\${pkgdir}/usr/bin/knotserver" 47 47 - install -Dm755 "\${srcdir}/build/repoguard" "\${pkgdir}/usr/bin/repoguard" 48 48 - install -Dm755 "\${srcdir}/build/keyfetch" "\${pkgdir}/usr/bin/keyfetch" 44 44 + install -Dm755 "\${srcdir}/build/knot" "\${pkgdir}/usr/bin/knot" 49 45 install -Dm644 "\${srcdir}/tangled/license" "\${pkgdir}/usr/share/licenses/tangled/LICENSE" 50 46 } 51 47 EOF

+2 -2

src/knotserver/README.md.sh

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

+3 -4

update.sh

··· 6 6 source src/README.md.sh 7 7 8 8 for pkgbuild_path in knotserver knotserver-git; do 9 9 - source src/common/sshd.conf.sh 10 10 - source src/common/tmpfiles.conf.sh 11 11 - source src/common/service.sh 12 12 - source src/common/install.sh 9 9 + for src in src/common/*.sh; do 10 10 + source ${src} 11 11 + done 13 12 for src in src/${pkgbuild_path}/*.sh; do 14 13 source ${src} 15 14 done