+1 -1

appview/PKGBUILD

··· 48 48 49 49 package() { 50 50 install -Dm755 "${srcdir}/build/appview" "${pkgdir}/usr/bin/appview" 51 51 - install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE" 51 51 + install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/appview.LICENSE" 52 52 }

+2 -2

conf.sh

··· 1 1 tag=1.7.0-alpha 2 2 knotserver_user=git 3 3 knotserver_group=git 4 4 - knotserver_path=/var/lib/tangled 5 5 - knotserver_repo_path=/var/lib/tangled/repositories 4 4 + knotserver_path=/var/lib/knotserver 5 5 + knotserver_repo_path=/var/lib/tangled 6 6 knotserver_log_directory=/var/log/knotserver

+3 -3

knotserver-git/.SRCINFO

··· 15 15 source = knotserver-sshd.conf 16 16 source = knotserver-tmpfiles.conf 17 17 sha256sums = SKIP 18 18 - sha256sums = 8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5 19 19 - sha256sums = 933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491 20 20 - sha256sums = cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171 18 18 + sha256sums = 068effb4a9bfef7f3fee71d4eb1a151942e9eb26d208b16ee702d7447fdeca09 19 19 + sha256sums = 825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8 20 20 + sha256sums = 21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394 21 21 22 22 pkgname = knotserver-git

+4 -4

knotserver-git/PKGBUILD

··· 16 16 ${_pkgname}-sshd.conf 17 17 ${_pkgname}-tmpfiles.conf) 18 18 sha256sums=('SKIP' 19 19 - '8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5' 20 20 - '933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491' 21 21 - 'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171') 19 19 + '068effb4a9bfef7f3fee71d4eb1a151942e9eb26d208b16ee702d7447fdeca09' 20 20 + '825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8' 21 21 + '21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394') 22 22 23 23 pkgver() { 24 24 cd ${srcdir}/tangled ··· 44 44 install -Dm644 "${srcdir}/${_pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf" 45 45 install -Dm644 "${srcdir}/${_pkgname}-sshd.conf" "${pkgdir}/usr/lib/systemd/sshd_config.d/${_pkgname}.conf" 46 46 install -Dm755 "${srcdir}/build/knot" "${pkgdir}/usr/bin/knot" 47 47 - install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE" 47 47 + install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" 48 48 }

+3 -3

knotserver-git/README.md

··· 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`. 5 5 + When installed, knotserver's database files will be stored in `/var/lib/knotserver`. Repositories will 6 6 + be stored in `/var/lib/tangled`. 7 7 8 8 ## SSH 9 9 ··· 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 15 15 + usermod -s /usr/bin/bash -d /var/lib/tangled git 16 16 ``` 17 17

+1 -1

knotserver-git/knotserver-sshd.conf

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

+1 -1

knotserver-git/knotserver-tmpfiles.conf

··· 1 1 d /etc/tangled 700 root root 2 2 + d /var/lib/knotserver 755 git git - 2 3 d /var/lib/tangled 755 git git - 3 3 - d /var/lib/tangled/repositories 755 git git -

+2 -2

knotserver-git/knotserver.install

··· 1 1 post_install() { 2 2 echo 3 3 - echo knotserver installed, with repositories stored in: /var/lib/tangled/repositories 3 3 + echo knotserver installed, with repositories stored in: /var/lib/tangled 4 4 echo 5 5 echo Set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver 6 6 echo and 'KNOT_SERVER_HOSTNAME' if 'hostname' does not return the FQDN ··· 8 8 echo 9 9 echo To enable git push over ssh for tangled repositories, run: 10 10 echo " ln -s /usr/lib/systemd/sshd_config.d/knotserver.conf /etc/ssh/sshd_config.d/30-knotserver.conf" 11 11 - echo " usermod -s /usr/bin/bash -d /var/lib/tangled/repositories git" 11 11 + echo " usermod -s /usr/bin/bash -d /var/lib/tangled git" 12 12 echo 13 13 echo and reload sshd 14 14 echo

+3 -3

knotserver-git/knotserver.service

··· 2 2 Description=tangled knot server 3 3 After=network.target network-online.target 4 4 Wants=network-online.target 5 5 + AssertPathExists=/var/lib/knotserver 5 6 AssertPathExists=/var/lib/tangled 6 6 - AssertPathExists=/var/lib/tangled/repositories 7 7 8 8 [Service] 9 9 Environment="KNOT_SERVER_HOSTNAME=%H" 10 10 Environment="KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555" 11 11 - Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled/repositories" 11 11 + Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled" 12 12 EnvironmentFile=-/etc/tangled/knotserver 13 13 14 14 - WorkingDirectory=/var/lib/tangled 14 14 + WorkingDirectory=/var/lib/knotserver 15 15 ExecStart=/usr/bin/knot server 16 16 Restart=always 17 17 User=git

+3 -3

knotserver/.SRCINFO

··· 16 16 source = knotserver-sshd.conf 17 17 source = knotserver-tmpfiles.conf 18 18 sha256sums = 580e1f3547d4c16a3c62a61361332978432680b92fe59a47ba077734970ac94c 19 19 - sha256sums = 8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5 20 20 - sha256sums = 933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491 21 21 - sha256sums = cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171 19 19 + sha256sums = 068effb4a9bfef7f3fee71d4eb1a151942e9eb26d208b16ee702d7447fdeca09 20 20 + sha256sums = 825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8 21 21 + sha256sums = 21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394 22 22 23 23 pkgname = knotserver

+4 -4

knotserver/PKGBUILD

··· 17 17 ${_pkgname}-sshd.conf 18 18 ${_pkgname}-tmpfiles.conf) 19 19 sha256sums=('580e1f3547d4c16a3c62a61361332978432680b92fe59a47ba077734970ac94c' 20 20 - '8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5' 21 21 - '933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491' 22 22 - 'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171') 20 20 + '068effb4a9bfef7f3fee71d4eb1a151942e9eb26d208b16ee702d7447fdeca09' 21 21 + '825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8' 22 22 + '21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394') 23 23 24 24 build() { 25 25 mkdir -p ${srcdir}/build ··· 40 40 install -Dm644 "${srcdir}/${_pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf" 41 41 install -Dm644 "${srcdir}/${_pkgname}-sshd.conf" "${pkgdir}/usr/lib/systemd/sshd_config.d/${_pkgname}.conf" 42 42 install -Dm755 "${srcdir}/build/knot" "${pkgdir}/usr/bin/knot" 43 43 - install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE" 43 43 + install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" 44 44 }

+3 -3

knotserver/README.md

··· 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`. 5 5 + When installed, knotserver's database files will be stored in `/var/lib/knotserver`. Repositories will 6 6 + be stored in `/var/lib/tangled`. 7 7 8 8 ## SSH 9 9 ··· 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 15 15 + usermod -s /usr/bin/bash -d /var/lib/tangled git 16 16 ``` 17 17

+1 -1

knotserver/knotserver-sshd.conf

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

+1 -1

knotserver/knotserver-tmpfiles.conf

··· 1 1 d /etc/tangled 700 root root 2 2 + d /var/lib/knotserver 755 git git - 2 3 d /var/lib/tangled 755 git git - 3 3 - d /var/lib/tangled/repositories 755 git git -

+2 -2

knotserver/knotserver.install

··· 1 1 post_install() { 2 2 echo 3 3 - echo knotserver installed, with repositories stored in: /var/lib/tangled/repositories 3 3 + echo knotserver installed, with repositories stored in: /var/lib/tangled 4 4 echo 5 5 echo Set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver 6 6 echo and 'KNOT_SERVER_HOSTNAME' if 'hostname' does not return the FQDN ··· 8 8 echo 9 9 echo To enable git push over ssh for tangled repositories, run: 10 10 echo " ln -s /usr/lib/systemd/sshd_config.d/knotserver.conf /etc/ssh/sshd_config.d/30-knotserver.conf" 11 11 - echo " usermod -s /usr/bin/bash -d /var/lib/tangled/repositories git" 11 11 + echo " usermod -s /usr/bin/bash -d /var/lib/tangled git" 12 12 echo 13 13 echo and reload sshd 14 14 echo

+3 -3

knotserver/knotserver.service

··· 2 2 Description=tangled knot server 3 3 After=network.target network-online.target 4 4 Wants=network-online.target 5 5 + AssertPathExists=/var/lib/knotserver 5 6 AssertPathExists=/var/lib/tangled 6 6 - AssertPathExists=/var/lib/tangled/repositories 7 7 8 8 [Service] 9 9 Environment="KNOT_SERVER_HOSTNAME=%H" 10 10 Environment="KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555" 11 11 - Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled/repositories" 11 11 + Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled" 12 12 EnvironmentFile=-/etc/tangled/knotserver 13 13 14 14 - WorkingDirectory=/var/lib/tangled 14 14 + WorkingDirectory=/var/lib/knotserver 15 15 ExecStart=/usr/bin/knot server 16 16 Restart=always 17 17 User=git

+1 -1

src/knotserver/PKGBUILD.sh

··· 42 42 install -Dm644 "\${srcdir}/\${_pkgname}-tmpfiles.conf" "\${pkgdir}/usr/lib/tmpfiles.d/\${_pkgname}.conf" 43 43 install -Dm644 "\${srcdir}/\${_pkgname}-sshd.conf" "\${pkgdir}/usr/lib/systemd/sshd_config.d/\${_pkgname}.conf" 44 44 install -Dm755 "\${srcdir}/build/knot" "\${pkgdir}/usr/bin/knot" 45 45 - install -Dm644 "\${srcdir}/tangled/license" "\${pkgdir}/usr/share/licenses/tangled/LICENSE" 45 45 + install -Dm644 "\${srcdir}/tangled/license" "\${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" 46 46 } 47 47 EOF