diff --git a/nextcloud.spec b/nextcloud.spec index 8575035..ad8dc45 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -199,7 +199,7 @@ Summary: Httpd integration for NextCloud Provides: %{name}-webserver = %{version}-%{release} Requires: %{name} = %{version}-%{release} # PHP dependencies -Requires: php-fpm +Requires: php-fpm httpd %description httpd %{summary}. @@ -470,6 +470,8 @@ install -Dpm 644 %{SOURCE200} \ %{buildroot}%{_sysconfdir}/nginx/default.d/%{name}.conf install -Dpm 644 %{SOURCE201} \ %{buildroot}%{_sysconfdir}/nginx/conf.d/%{name}.conf + +# php-fpm config install -Dpm 644 %{SOURCE202} \ %{buildroot}%{_sysconfdir}/php-fpm.d/%{name}.conf @@ -479,10 +481,12 @@ install -Dpm 644 %{SOURCE3} %{buildroot}%{_unitdir}/nextcloud-cron.timer %post httpd /usr/bin/systemctl reload httpd.service > /dev/null 2>&1 || : +/usr/bin/systemctl reload php-fpm.service > /dev/null 2>&1 || : %postun httpd if [ $1 -eq 0 ]; then /usr/bin/systemctl reload httpd.service > /dev/null 2>&1 || : + /usr/bin/systemctl reload php-fpm.service > /dev/null 2>&1 || : fi %post nginx @@ -515,6 +519,7 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %{_sysconfdir}/httpd/conf.d/%{name}-access.conf.avail %{_sysconfdir}/httpd/conf.d/%{name}*.inc +%config(noreplace) %{_sysconfdir}/php-fpm.d/%{name}.conf %files nginx %config(noreplace) %{_sysconfdir}/nginx/default.d/%{name}.conf @@ -531,7 +536,7 @@ fi %changelog * Wed Jun 30 2021 Christopher Engelhard - 19.0.12-1 - Update to Nextcloud 19.0.12 -- Fixes CVE CVE-2021-22915 / RHBZ 1977202 +- Include php-fpm config in httpd subpackage * Sun Feb 28 2021 Christopher Engelhard - 19.0.9-1 - Update to Nextcloud 19.0.9