From c763f8994d41b86f80d84b05a35e227dcd477eda Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 9 Jul 2020 10:47:00 +0200 Subject: [PATCH] testing/baculum: fix dependencies and permissions for lighttpd --- testing/baculum/APKBUILD | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/testing/baculum/APKBUILD b/testing/baculum/APKBUILD index 0f9401babac..115dbc21f29 100644 --- a/testing/baculum/APKBUILD +++ b/testing/baculum/APKBUILD @@ -1,27 +1,33 @@ # Maintainer: Natanael Copa pkgname=baculum pkgver=9.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="API layer to Baculum WebGUI tool for Bacula Community program" url="https://bacula.org/" arch="noarch" license="AGPLv3" depends="" _php=php7 -_api_depends="$_php-bcmath +_common_depends=" $_php-common + $_php-ctype + $_php-curl + $_php-dom + $_php-json + $_php-session + $_php-xml + " +_api_depends=" + $_php-bcmath $_php-mysqlnd $_php-pdo $_php-pgsql - $_php-xml" + " _web_depends=" - $_php-common - $_php-ctype - $_php-dom $_php-mbstring - $_php-xml " makedepends=" + $_common_depends $_api_depends $_web_depends " @@ -56,10 +62,14 @@ package() { "$pkgdir"/usr/share/baculum/htdocs/protected/runtime \ "$pkgdir"/var/cache/baculum + chgrp -R www-data "$pkgdir"/etc/baculum/Config-* + chmod g+w "$pkgdir"/etc/baculum/Config-* + chmod g+r "$pkgdir"/etc/baculum/Config-*/baculum.users } _common() { pkgdesc="Common libraries for Baculum" + depends="$_common_depends" amove usr/share/baculum/htdocs/protected/Common \ usr/share/baculum/htdocs/protected/application.xml \ usr/share/baculum/htdocs/framework \ @@ -111,6 +121,7 @@ _api_apache2() { _api_lighttpd() { pkgdesc="Lighttpd configuration for Baculum API" + depends="$pkgname-api lighttpd lighttpd-mod_auth php-cgi" amove etc/baculum/Config-api-lighttpd \ etc/baculum/baculum-api-lighttpd.conf mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/API @@ -129,6 +140,7 @@ _web_apache2() { _web_lighttpd() { pkgdesc="Lighttpd configuration for Baculum WebGUI" + depends="$pkgname-web lighttpd lighttpd-mod_auth php-cgi" amove etc/baculum/Config-web-lighttpd \ etc/baculum/baculum-web-lighttpd.conf mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/Web