diff --git a/packaging/alpine/local/nifi/APKBUILD b/packaging/alpine/local/nifi/APKBUILD index 742871b..0667790 100644 --- a/packaging/alpine/local/nifi/APKBUILD +++ b/packaging/alpine/local/nifi/APKBUILD @@ -12,7 +12,6 @@ install="$pkgname.pre-install" pkgusers="nifi" pkggroups="nifi" subpackages=" - $pkgname-doc $pkgname-openrc:_openrc:noarch " options="!check !strip !tracedeps" @@ -27,6 +26,7 @@ package() { install -d "$pkgdir"/usr/lib/nifi "$pkgdir"/etc/nifi cp -a "$builddir"/. "$pkgdir"/usr/lib/nifi/ + chmod -R a+rX "$pkgdir"/usr/lib/nifi cp -a "$pkgdir"/usr/lib/nifi/conf/. "$pkgdir"/etc/nifi/ rm -r "$pkgdir"/usr/lib/nifi/conf @@ -34,12 +34,17 @@ package() { install -d -m 0750 -o nifi -g nifi "$pkgdir"/var/lib/nifi for _dir in \ + assets \ + connector_assets \ content_repository \ database_repository \ + diagnostics \ extensions \ flowfile_repository \ + nar_repository \ provenance_repository \ state \ + status_repository \ work; do install -d -m 0750 -o nifi -g nifi "$pkgdir"/var/lib/nifi/$_dir ln -s /var/lib/nifi/$_dir "$pkgdir"/usr/lib/nifi/$_dir @@ -52,8 +57,6 @@ package() { chmod 0750 "$pkgdir"/etc/nifi install -Dm755 "$srcdir"/nifi.wrapper "$pkgdir"/usr/bin/nifi - install -d "$pkgdir"/usr/share/doc - mv "$pkgdir"/usr/lib/nifi/docs "$pkgdir"/usr/share/doc/$pkgname } _openrc() { diff --git a/packaging/alpine/local/nifi/scripts/runtime-test.sh b/packaging/alpine/local/nifi/scripts/runtime-test.sh index fe2ac0d..fdffb22 100755 --- a/packaging/alpine/local/nifi/scripts/runtime-test.sh +++ b/packaging/alpine/local/nifi/scripts/runtime-test.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -apk add nifi nifi-doc nifi-openrc curl +apk add nifi nifi-openrc curl test -x /usr/bin/nifi test -x /usr/lib/nifi/bin/nifi.sh @@ -12,7 +12,7 @@ test -d /var/lib/nifi test -d /var/log/nifi test -f /etc/init.d/nifi test -f /etc/conf.d/nifi -test -d /usr/share/doc/nifi +test -d /usr/lib/nifi/docs test "$(stat -c '%U:%G %a' /var/lib/nifi)" = "nifi:nifi 750" rc-update add nifi default || true diff --git a/packaging/alpine/local/nifi/scripts/test-install.sh b/packaging/alpine/local/nifi/scripts/test-install.sh index 8e95c2c..43bc16e 100755 --- a/packaging/alpine/local/nifi/scripts/test-install.sh +++ b/packaging/alpine/local/nifi/scripts/test-install.sh @@ -20,7 +20,7 @@ apk_test_install_run "${repo_root}" "${PACKAGE_NAME:-nifi}" "${PACKAGE_VERSION:- printf "%s\n" /repo >> /etc/apk/repositories fi apk update - apk add "${PACKAGE_NAME}" "${PACKAGE_NAME}-doc" "${PACKAGE_NAME}-openrc" + apk add "${PACKAGE_NAME}" "${PACKAGE_NAME}-openrc" test -x /usr/bin/nifi test -x /usr/lib/nifi/bin/nifi.sh @@ -31,7 +31,7 @@ apk_test_install_run "${repo_root}" "${PACKAGE_NAME:-nifi}" "${PACKAGE_VERSION:- test -d /var/log/nifi test -f /etc/init.d/nifi test -f /etc/conf.d/nifi - test -d /usr/share/doc/nifi + test -d /usr/lib/nifi/docs test "$(stat -c '%U:%G %a' /var/lib/nifi)" = "nifi:nifi 750" rc-update add nifi default