diff --git a/conf.sh b/conf.sh --- a/conf.sh +++ b/conf.sh @@ -1,6 +1,6 @@ tag=1.7.0-alpha knotserver_user=git knotserver_group=git -knotserver_path=/var/lib/tangled -knotserver_repo_path=/var/lib/tangled/repositories +knotserver_path=/var/lib/knotserver +knotserver_repo_path=/var/lib/tangled knotserver_log_directory=/var/log/knotserver diff --git a/appview/PKGBUILD b/appview/PKGBUILD --- a/appview/PKGBUILD +++ b/appview/PKGBUILD @@ -48,5 +48,5 @@ package() { install -Dm755 "${srcdir}/build/appview" "${pkgdir}/usr/bin/appview" - install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE" + install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/appview.LICENSE" } diff --git a/knotserver-git/.SRCINFO b/knotserver-git/.SRCINFO --- a/knotserver-git/.SRCINFO +++ b/knotserver-git/.SRCINFO @@ -15,8 +15,8 @@ source = knotserver-sshd.conf source = knotserver-tmpfiles.conf sha256sums = SKIP - sha256sums = 8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5 - sha256sums = 933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491 - sha256sums = cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171 + sha256sums = 068effb4a9bfef7f3fee71d4eb1a151942e9eb26d208b16ee702d7447fdeca09 + sha256sums = 825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8 + sha256sums = 21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394 pkgname = knotserver-git diff --git a/knotserver-git/PKGBUILD b/knotserver-git/PKGBUILD --- a/knotserver-git/PKGBUILD +++ b/knotserver-git/PKGBUILD @@ -16,9 +16,9 @@ ${_pkgname}-sshd.conf ${_pkgname}-tmpfiles.conf) sha256sums=('SKIP' - '8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5' - '933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491' - 'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171') + '068effb4a9bfef7f3fee71d4eb1a151942e9eb26d208b16ee702d7447fdeca09' + '825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8' + '21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394') pkgver() { cd ${srcdir}/tangled @@ -44,5 +44,5 @@ 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/knot" "${pkgdir}/usr/bin/knot" - install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE" + install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" } diff --git a/knotserver-git/README.md b/knotserver-git/README.md --- a/knotserver-git/README.md +++ b/knotserver-git/README.md @@ -2,8 +2,8 @@ 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`. +When installed, knotserver's database files will be stored in `/var/lib/knotserver`. Repositories will +be stored in `/var/lib/tangled`. ## SSH @@ -12,6 +12,6 @@ ```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 +usermod -s /usr/bin/bash -d /var/lib/tangled git ``` diff --git a/knotserver-git/knotserver-sshd.conf b/knotserver-git/knotserver-sshd.conf --- a/knotserver-git/knotserver-sshd.conf +++ b/knotserver-git/knotserver-sshd.conf @@ -1,3 +1,3 @@ Match User git - AuthorizedKeysCommand /usr/bin/knot keys -output authorized-keys -git-dir /var/lib/tangled/repositories -log-path /var/log/knotserver/keyfetch.log + AuthorizedKeysCommand /usr/bin/knot keys -output authorized-keys -git-dir /var/lib/tangled -log-path /var/log/knotserver/keyfetch.log AuthorizedKeysCommandUser nobody diff --git a/knotserver-git/knotserver-tmpfiles.conf b/knotserver-git/knotserver-tmpfiles.conf --- a/knotserver-git/knotserver-tmpfiles.conf +++ b/knotserver-git/knotserver-tmpfiles.conf @@ -1,3 +1,3 @@ d /etc/tangled 700 root root +d /var/lib/knotserver 755 git git - d /var/lib/tangled 755 git git - -d /var/lib/tangled/repositories 755 git git - diff --git a/knotserver-git/knotserver.install b/knotserver-git/knotserver.install --- a/knotserver-git/knotserver.install +++ b/knotserver-git/knotserver.install @@ -1,6 +1,6 @@ post_install() { echo - echo knotserver installed, with repositories stored in: /var/lib/tangled/repositories + echo knotserver installed, with repositories stored in: /var/lib/tangled echo echo Set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver echo and 'KNOT_SERVER_HOSTNAME' if 'hostname' does not return the FQDN @@ -8,7 +8,7 @@ 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/repositories git" + echo " usermod -s /usr/bin/bash -d /var/lib/tangled git" echo echo and reload sshd echo diff --git a/knotserver-git/knotserver.service b/knotserver-git/knotserver.service --- a/knotserver-git/knotserver.service +++ b/knotserver-git/knotserver.service @@ -2,16 +2,16 @@ 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/repositories" +Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled" EnvironmentFile=-/etc/tangled/knotserver -WorkingDirectory=/var/lib/tangled +WorkingDirectory=/var/lib/knotserver ExecStart=/usr/bin/knot server Restart=always User=git diff --git a/knotserver/.SRCINFO b/knotserver/.SRCINFO --- a/knotserver/.SRCINFO +++ b/knotserver/.SRCINFO @@ -16,8 +16,8 @@ source = knotserver-sshd.conf source = knotserver-tmpfiles.conf sha256sums = 580e1f3547d4c16a3c62a61361332978432680b92fe59a47ba077734970ac94c - sha256sums = 8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5 - sha256sums = 933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491 - sha256sums = cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171 + sha256sums = 068effb4a9bfef7f3fee71d4eb1a151942e9eb26d208b16ee702d7447fdeca09 + sha256sums = 825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8 + sha256sums = 21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394 pkgname = knotserver diff --git a/knotserver/PKGBUILD b/knotserver/PKGBUILD --- a/knotserver/PKGBUILD +++ b/knotserver/PKGBUILD @@ -17,9 +17,9 @@ ${_pkgname}-sshd.conf ${_pkgname}-tmpfiles.conf) sha256sums=('580e1f3547d4c16a3c62a61361332978432680b92fe59a47ba077734970ac94c' - '8bf667569ca537ac65cf64c5395da3d594847692187977148b8026b50fdda8e5' - '933042fd741dde2840888bd8d9f6293d1b1a37f3e442c2e9d84191412c022491' - 'cd09d9faa49f248ce7decfcd712269b8312dd20b6e460b478e8e823489b97171') + '068effb4a9bfef7f3fee71d4eb1a151942e9eb26d208b16ee702d7447fdeca09' + '825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8' + '21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394') build() { mkdir -p ${srcdir}/build @@ -40,5 +40,5 @@ 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/knot" "${pkgdir}/usr/bin/knot" - install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/LICENSE" + install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" } diff --git a/knotserver/README.md b/knotserver/README.md --- a/knotserver/README.md +++ b/knotserver/README.md @@ -2,8 +2,8 @@ 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`. +When installed, knotserver's database files will be stored in `/var/lib/knotserver`. Repositories will +be stored in `/var/lib/tangled`. ## SSH @@ -12,6 +12,6 @@ ```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 +usermod -s /usr/bin/bash -d /var/lib/tangled git ``` diff --git a/knotserver/knotserver-sshd.conf b/knotserver/knotserver-sshd.conf --- a/knotserver/knotserver-sshd.conf +++ b/knotserver/knotserver-sshd.conf @@ -1,3 +1,3 @@ Match User git - AuthorizedKeysCommand /usr/bin/knot keys -output authorized-keys -git-dir /var/lib/tangled/repositories -log-path /var/log/knotserver/keyfetch.log + AuthorizedKeysCommand /usr/bin/knot keys -output authorized-keys -git-dir /var/lib/tangled -log-path /var/log/knotserver/keyfetch.log AuthorizedKeysCommandUser nobody diff --git a/knotserver/knotserver-tmpfiles.conf b/knotserver/knotserver-tmpfiles.conf --- a/knotserver/knotserver-tmpfiles.conf +++ b/knotserver/knotserver-tmpfiles.conf @@ -1,3 +1,3 @@ d /etc/tangled 700 root root +d /var/lib/knotserver 755 git git - d /var/lib/tangled 755 git git - -d /var/lib/tangled/repositories 755 git git - diff --git a/knotserver/knotserver.install b/knotserver/knotserver.install --- a/knotserver/knotserver.install +++ b/knotserver/knotserver.install @@ -1,6 +1,6 @@ post_install() { echo - echo knotserver installed, with repositories stored in: /var/lib/tangled/repositories + echo knotserver installed, with repositories stored in: /var/lib/tangled echo echo Set 'KNOT_SERVER_SECRET="..."' in /etc/tangled/knotserver echo and 'KNOT_SERVER_HOSTNAME' if 'hostname' does not return the FQDN @@ -8,7 +8,7 @@ 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/repositories git" + echo " usermod -s /usr/bin/bash -d /var/lib/tangled git" echo echo and reload sshd echo diff --git a/knotserver/knotserver.service b/knotserver/knotserver.service --- a/knotserver/knotserver.service +++ b/knotserver/knotserver.service @@ -2,16 +2,16 @@ 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/repositories" +Environment="KNOT_REPO_SCAN_PATH=/var/lib/tangled" EnvironmentFile=-/etc/tangled/knotserver -WorkingDirectory=/var/lib/tangled +WorkingDirectory=/var/lib/knotserver ExecStart=/usr/bin/knot server Restart=always User=git diff --git a/src/knotserver/PKGBUILD.sh b/src/knotserver/PKGBUILD.sh --- a/src/knotserver/PKGBUILD.sh +++ b/src/knotserver/PKGBUILD.sh @@ -42,6 +42,6 @@ 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/knot" "\${pkgdir}/usr/bin/knot" - install -Dm644 "\${srcdir}/tangled/license" "\${pkgdir}/usr/share/licenses/tangled/LICENSE" + install -Dm644 "\${srcdir}/tangled/license" "\${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" } EOF