update config and add readme's

README.md

···
 # pkgs
 
-PKGBUILDs for [@tangled.sh](https://tangled.sh/@tangled.sh/core) on [Arch](https://archlinux.org).
+PKGBUILDs for running [@tangled.sh](https://tangled.sh/@tangled.sh/core) on [Arch](https://archlinux.org).
+
+> [!NOTE]
+> I use these packages to deploy to my knot server.
+>
+> These are **not** official tangled packages. **DO NOT** direct issues using these packages to the core tangled.sh repository.
+
+## Packages:
+
+### [appview](appview)
+
+Builds `appview` from tag [v1.3.0-alpha](https://tangled.sh/@tangled.sh/core/tree/v1.3.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).
+
+### [knotserver-git](knotserver-git)
+
+Builds `knotserver`, `keyfetch`, and `repoguard` from branch [master](https://tangled.sh/@tangled.sh/core/tree/master).
 

conf.sh

···
+tag=1.3.0-alpha
 knotserver_user=git
 knotserver_group=git
-
-# Path knotserver database files will be stored.
-knotserver_db_path=/var/lib/knotserver
-
-# Path knotserver hosted git repositories will be stored.
-knotserver_repo_path=/var/lib/tangled
-
+knotserver_path=/var/lib/tangled
+knotserver_repo_path=/var/lib/tangled/repositories
 knotserver_log_directory=/var/log/knotserver

knotserver-git/.SRCINFO

···
 pkgbase = knotserver-git
 	pkgdesc = git collaboration platform built on ATproto
-	pkgver = 1.3.0.alpha.r2.gdacad6d
+	pkgver = 1.3.0.alpha.r48.gd4332d6
 	pkgrel = 1
 	url = https://tangled.sh/@tangled.sh/core
 	install = knotserver.install
···
 	source = knotserver-sshd.conf
 	source = knotserver-tmpfiles.conf
 	sha256sums = SKIP
-	sha256sums = 8d243e1bc0d2e51079550929019d18811679127e6af6aabeed60cd907ffaab32
-	sha256sums = 7201f3f71b4282a99903b481a5d9ab4a26b2b305de8f0c6980570edd8de7137e
-	sha256sums = 30d0b9df2419c22f930649273e006faa1bdab740f03c47d740c941db45dc951e
+	sha256sums = e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6
+	sha256sums = 0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37
+	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.r2.gdacad6d
+pkgver=1.3.0.alpha.r48.gd4332d6
 pkgrel=1
 license=(MIT)
 arch=(x86_64)
···
 		${_pkgname}-sshd.conf
 		${_pkgname}-tmpfiles.conf)
 sha256sums=('SKIP'
-            '8d243e1bc0d2e51079550929019d18811679127e6af6aabeed60cd907ffaab32'
-            '7201f3f71b4282a99903b481a5d9ab4a26b2b305de8f0c6980570edd8de7137e'
-            '30d0b9df2419c22f930649273e006faa1bdab740f03c47d740c941db45dc951e')
+            'e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6'
+            '0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37'
+            'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171')
 
 pkgver() {
 	cd ${srcdir}/tangled
···
 	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
 
 	cd ${srcdir}/tangled
-	go build -o "${srcdir}/build/knotserver" ./cmd/knotserver
+	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
 }

knotserver-git/knotserver-sshd.conf

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

knotserver-git/knotserver-tmpfiles.conf

···
 d /etc/tangled 700 root root
 d /var/lib/tangled 755 git git -
+d /var/lib/tangled/repositories 755 git git -

knotserver-git/knotserver.install

···
 post_install() {
   echo
-  echo knotserver installed, with repositories stored in: /var/lib/tangled
+  echo knotserver installed, with repositories stored in: /var/lib/tangled/repositories
   echo
-  echo Remember to set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver
+  echo Set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver
   echo and 'KNOT_SERVER_HOSTNAME' if 'hostname' does not return the FQDN
   echo of your knot.
   echo
   echo To enable git push over ssh for tangled repositories, run:
   echo "  ln -s /usr/lib/systemd/sshd_config.d/knotserver.conf /etc/ssh/sshd_config.d/30-knotserver.conf"
-  echo "  usermod -s /usr/bin/bash -d /var/lib/tangled git"
+  echo "  usermod -s /usr/bin/bash -d /var/lib/tangled/repositories git"
   echo
   echo and reload sshd
   echo

knotserver-git/knotserver.service

···
 Description=tangled knot server
 After=network.target network-online.target
 Wants=network-online.target
-AssertPathExists=/var/lib/knotserver
 AssertPathExists=/var/lib/tangled
+AssertPathExists=/var/lib/tangled/repositories
 
 [Service]
 Environment="KNOT_SERVER_HOSTNAME=%H"
 Environment="KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555"
-Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled"
+Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled/repositories"
 EnvironmentFile=-/etc/tangled/knotserver
 
-WorkingDirectory=/var/lib/knotserver
+WorkingDirectory=/var/lib/tangled
 ExecStart=/usr/bin/knotserver
 Restart=always
 User=git

knotserver/.SRCINFO

···
 	source = knotserver-sshd.conf
 	source = knotserver-tmpfiles.conf
 	sha256sums = 790dfc1fb65dfc6db973f411a65088f865325f548f24ac1358fd65a52eaa0eee
-	sha256sums = 8d243e1bc0d2e51079550929019d18811679127e6af6aabeed60cd907ffaab32
-	sha256sums = 7201f3f71b4282a99903b481a5d9ab4a26b2b305de8f0c6980570edd8de7137e
-	sha256sums = 30d0b9df2419c22f930649273e006faa1bdab740f03c47d740c941db45dc951e
+	sha256sums = e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6
+	sha256sums = 0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37
+	sha256sums = cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171
 
 pkgname = knotserver

knotserver/PKGBUILD

···
 makedepends=(go)
 options=(strip !debug)
 install=${_pkgname}.install
-source=("tangled::git+$url#tag=v$_pkgver"
+source=("tangled::git+$url#tag=v${_pkgver}"
 		${_pkgname}.service
 		${_pkgname}-sshd.conf
 		${_pkgname}-tmpfiles.conf)
 sha256sums=('790dfc1fb65dfc6db973f411a65088f865325f548f24ac1358fd65a52eaa0eee'
-            '8d243e1bc0d2e51079550929019d18811679127e6af6aabeed60cd907ffaab32'
-            '7201f3f71b4282a99903b481a5d9ab4a26b2b305de8f0c6980570edd8de7137e'
-            '30d0b9df2419c22f930649273e006faa1bdab740f03c47d740c941db45dc951e')
+            'e6683a884d99866d883658d331d0080a428ee7ce38b3fab5f2edd7c478c9f3b6'
+            '0a449ba545f787cb6bbb45419133fa62d94f3b4479000fbdb3658dc85dcf1b37'
+            'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171')
 
 build() {
 	mkdir -p ${srcdir}/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 -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
 }
 
 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"

knotserver/README.md

···
+# knotserver
+
+Builds and packages `knotserver`, `keyfetch`, and `repoguard`.
+
+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/knotserver-sshd.conf

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

knotserver/knotserver-tmpfiles.conf

···
 d /etc/tangled 700 root root
 d /var/lib/tangled 755 git git -
+d /var/lib/tangled/repositories 755 git git -

knotserver/knotserver.install

···
 post_install() {
   echo
-  echo knotserver installed, with repositories stored in: /var/lib/tangled
+  echo knotserver installed, with repositories stored in: /var/lib/tangled/repositories
   echo
-  echo Remember to set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver
+  echo Set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver
   echo and 'KNOT_SERVER_HOSTNAME' if 'hostname' does not return the FQDN
   echo of your knot.
   echo
   echo To enable git push over ssh for tangled repositories, run:
   echo "  ln -s /usr/lib/systemd/sshd_config.d/knotserver.conf /etc/ssh/sshd_config.d/30-knotserver.conf"
-  echo "  usermod -s /usr/bin/bash -d /var/lib/tangled git"
+  echo "  usermod -s /usr/bin/bash -d /var/lib/tangled/repositories git"
   echo
   echo and reload sshd
   echo

knotserver/knotserver.service

···
 Description=tangled knot server
 After=network.target network-online.target
 Wants=network-online.target
-AssertPathExists=/var/lib/knotserver
 AssertPathExists=/var/lib/tangled
+AssertPathExists=/var/lib/tangled/repositories
 
 [Service]
 Environment="KNOT_SERVER_HOSTNAME=%H"
 Environment="KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555"
-Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled"
+Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled/repositories"
 EnvironmentFile=-/etc/tangled/knotserver
 
-WorkingDirectory=/var/lib/knotserver
+WorkingDirectory=/var/lib/tangled
 ExecStart=/usr/bin/knotserver
 Restart=always
 User=git

src/README.md.sh

···
+#!/usr/bin/bash
+cat << EOF > ${pkgbuild_path}/README.md
+# pkgs
+
+PKGBUILDs for running [@tangled.sh](https://tangled.sh/@tangled.sh/core) on [Arch](https://archlinux.org).
+
+> [!NOTE]
+> I use these packages to deploy to my knot server.
+>
+> These are **not** official tangled packages. **DO NOT** direct issues using these packages to the core tangled.sh repository.
+
+## Packages:
+
+### [appview](appview)
+
+Builds \`appview\` from tag [v${tag}](https://tangled.sh/@tangled.sh/core/tree/v${tag}).
+
+### [knotserver](knotserver)
+
+Builds \`knotserver\`, \`keyfetch\`, and \`repoguard\` 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).
+
+EOF

src/common/install.sh

···
 cat << EOF > ${pkgbuild_path}/knotserver.install
 post_install() {
   echo
-  echo knotserver installed, with repositories stored in: $knotserver_repo_path
+  echo knotserver installed, with repositories stored in: ${knotserver_repo_path:-/var/lib/tangled/repositories}
   echo
-  echo Remember to set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver
+  echo Set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver
   echo and 'KNOT_SERVER_HOSTNAME' if 'hostname' does not return the FQDN
   echo of your knot.
   echo
   echo To enable git push over ssh for tangled repositories, run:
   echo "  ln -s /usr/lib/systemd/sshd_config.d/knotserver.conf /etc/ssh/sshd_config.d/30-knotserver.conf"
-  echo "  usermod -s /usr/bin/bash -d $knotserver_repo_path $knotserver_user"
+  echo "  usermod -s /usr/bin/bash -d ${knotserver_repo_path:-/var/lib/tangled/repositories} ${knotserver_user:-git}"
   echo
   echo and reload sshd
   echo

src/common/service.sh

···
 Description=tangled knot server
 After=network.target network-online.target
 Wants=network-online.target
-AssertPathExists=$knotserver_db_path
-AssertPathExists=$knotserver_repo_path
+AssertPathExists=${knotserver_path:-/var/lib/tangled}
+AssertPathExists=${knotserver_repo_path:-/var/lib/tangled/repositories}
 
 [Service]
 Environment="KNOT_SERVER_HOSTNAME=%H"
 Environment="KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555"
-Environment="KNOT_REPO_SCAN_PATH=${knotserver_repo_path}"
+Environment="KNOT_REPO_SCAN_PATH=${knotserver_repo_path:-/var/lib/tangled/repositories}"
 EnvironmentFile=-/etc/tangled/knotserver
 
-WorkingDirectory=$knotserver_db_path
+WorkingDirectory=${knotserver_path:-/var/lib/tangled}
 ExecStart=/usr/bin/knotserver
 Restart=always
-User=$knotserver_user
-Group=$knotserver_group
+User=${knotserver_user:-git}
+Group=${knotserver_group:-git}
 
 StandardOutput=journal
 StandardError=journal

src/common/sshd.conf.sh

···
 #!/usr/bin/bash
 cat << EOF > ${pkgbuild_path}/knotserver-sshd.conf
-Match User $knotserver_user
-  AuthorizedKeysCommand /usr/bin/keyfetch -git-dir $knotserver_repo_path -repoguard-path /usr/bin/repoguard -log-path ${knotserver_log_directory}/keyfetch.log
+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
   AuthorizedKeysCommandUser nobody
 EOF

src/common/tmpfiles.conf.sh

···
 #!/usr/bin/bash
 cat << EOF > ${pkgbuild_path}/knotserver-tmpfiles.conf
 d /etc/tangled 700 root root
-d $knotserver_repo_path 755 $knotserver_user $knotserver_group -
+d ${knotserver_path:-/var/lib/tangled} 755 ${knotserver_user:-git} ${knotserver_group:-git} -
+d ${knotserver_repo_path:-/var/lib/tangled/repositories} 755 ${knotserver_user:-git} ${knotserver_group:-git} -
 EOF

src/knotserver/PKGBUILD.sh

···
+#!/usr/bin/bash
+cat << EOF > ${pkgbuild_path}/PKGBUILD
+_pkgname=knotserver
+_pkgver=${tag}
+pkgname=\${_pkgname/\-/\.}
+pkgdesc='git collaboration platform built on ATproto'
+pkgver=\${_pkgver/\-/\.}
+pkgrel=1
+license=(MIT)
+arch=(x86_64)
+url=https://tangled.sh/@tangled.sh/core
+depends=(git)
+conflicts=(knotserver-git)
+makedepends=(go)
+options=(strip !debug)
+install=\${_pkgname}.install
+source=("tangled::git+\$url#tag=v\${_pkgver}"
+		\${_pkgname}.service
+		\${_pkgname}-sshd.conf
+		\${_pkgname}-tmpfiles.conf)
+sha256sums=('set by updpkgsums'
+            'set by updpkgsums'
+            'set by updpkgsums'
+            'set by updpkgsums')
+
+build() {
+	mkdir -p \${srcdir}/build
+
+	export CGO_ENABLED=1
+	export CGO_CPPFLAGS="\${CPPFLAGS}"
+	export CGO_CFLAGS="\${CFLAGS}"
+	export CGO_CXXFLAGS="\${CXXFLAGS}"
+	export CGO_LDFLAGS="\${LDFLAGS}"
+	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
+}
+
+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 -Dm644 "\${srcdir}/tangled/license" "\${pkgdir}/usr/share/licenses/tangled/LICENSE"
+}
+EOF

src/knotserver/README.md.sh

···
+#!/usr/bin/bash
+cat << EOF > ${pkgbuild_path}/README.md
+# knotserver
+
+Builds and packages \`knotserver\`, \`keyfetch\`, and \`repoguard\`.
+
+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

update.sh

···
 
 source ./conf.sh
 
+pkgbuild_path="."
+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/${pkgbuild_path}/*.sh; do
+    source ${src}
+  done
 
   cd $pkgbuild_path
   updpkgsums