diff --git a/APKBUILD b/APKBUILD index 9b4be952..b784e38c 100644 --- a/APKBUILD +++ b/APKBUILD @@ -32,6 +32,6 @@ check() { package() { make -C "${srcdir}/${_pkgname}/src" INSTALL_ROOT="${pkgdir}" install || return 1 - install -D -m644 "${srcdir}/${_pkgname}/config/default.ini" "${pkgdir}/etc/php/conf.d/${_pkgname}.rules" || return 1 - install -D -m644 "${srcdir}/${_pkgname}/config/${_pkgname}.ini" "${pkgdir}/etc/php7/conf.d/${_pkgname}.ini" || return 1 + install -D -m644 "${srcdir}/${_pkgname}/config/default.rules" "${pkgdir}/etc/php/conf.d/${_pkgname}.rules" || return 1 + install -D -m644 "${srcdir}/${_pkgname}/config/${_pkgname}.rules" "${pkgdir}/etc/php7/conf.d/${_pkgname}.rules" || return 1 } diff --git a/Makefile b/Makefile index 8c54f8c7..afde6b62 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ joomla: fi cd joomla-cms; composer install >/dev/null 2>/dev/null echo "\nWith snuffleupagus:" - cd joomla-cms; time libraries/vendor/phpunit/phpunit/phpunit -d "extension=./src/modules/snuffleupagus.so" -d "sp.configuration_file=config/default.ini" --no-coverage >/dev/null + cd joomla-cms; time libraries/vendor/phpunit/phpunit/phpunit -d "extension=./src/modules/snuffleupagus.so" -d "sp.configuration_file=config/default.rules" --no-coverage >/dev/null echo "\nWithout snuffleupagus:" cd joomla-cms; time libraries/vendor/phpunit/phpunit/phpunit --no-coverage >/dev/null diff --git a/debian/snuffleupagus.examples b/debian/snuffleupagus.examples index 9d70f9e6..0073babd 100644 --- a/debian/snuffleupagus.examples +++ b/debian/snuffleupagus.examples @@ -1 +1 @@ -config/default.ini \ No newline at end of file +config/default.rules