Changes - j0ke.net Open Build Service

Changes of Revision 3

[-] [+]	Changed	php5.changes
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 3 08:38:34 UTC 2012 - cs@linux-administrator.com + +- added sysconfig file for fpm package +- fix update-alternatives for fpm + +------------------------------------------------------------------- Mon Sep 17 10:16:44 UTC 2012 - cs@linux-administrator.com - update to version 5.3.17
[-] [+]	Changed	php5.spec ^
@@ -103,6 +103,7 @@ Source8: php-fpm-www.conf Source9: php-fpm.init Source10: php-fpm.logrotate +Source11: sysconfig.php-fpm Source99: php5-rpmlintrc #SUSE specific stuff Patch2: php5-phpize.patch @@ -1583,6 +1584,9 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 %{S:10} %{buildroot}%{_sysconfdir}/logrotate.d/php-fpm +# sysconfig +install -D -m 644 %{S:11} %{buildroot}/var/adm/fillup-templates/sysconfig.php-fpm + %post update-alternatives --install %{_bindir}/php php %{_bindir}/php5 5 \ --slave %{_mandir}/man1/php.1.gz php.1 %{_mandir}/man1/php5.1.gz @@ -1662,12 +1666,12 @@ %preun fpm %stop_on_removal php-fpm if [ $1 -eq 0 ]; then - update-alternatives --remove php-fpm %{_bindir}/php-fpm5 + update-alternatives --remove php-fpm %{_sbindir}/php-fpm5 fi %post fpm -%{fillup_and_insserv -f php-fpm} -update-alternatives --install %{_bindir}/php-fpm php-fpm %{_bindir}/php-fpm5 5 +%{fillup_and_insserv php-fpm} +update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php-fpm5 5 update-alternatives --auto php-fpm %clean @@ -1725,6 +1729,7 @@ /usr/share/php5/fpm/status.html %attr(770,wwwrun,www) %dir %{_localstatedir}/log/php-fpm %dir %{_localstatedir}/run/php-fpm +/var/adm/fillup-templates/sysconfig.php-fpm %files -n apache2-mod_php5 %defattr(644,root,root,755)
[-] [+]	Changed	php-fpm.init ^
@@ -126,6 +126,8 @@ FPM_CONFIG="--fpm-config /etc/php5/fpm/php-fpm.conf" +[ -f /etc/sysconfig/php-fpm ] && . /etc/sysconfig/php-fpm + # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. @@ -172,7 +174,7 @@ echo -n "Starting php-fpm" ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. - /sbin/startproc $PHPFPM_BIN $FPM_CONFIG + /sbin/startproc $PHPFPM_BIN $FPM_CONFIG $FPM_OPTIONS # Remember status and be verbose rc_status -v
[-] [+]	Added	sysconfig.php-fpm ^
@@ -0,0 +1,18 @@ +## Path: Network/WWW/php +## Description: FPM Config +## Type: string +## Default: "" +## ServiceRestart: php-fpm +# +# Options for php-fpm +# +FPM_CONFIG="--fpm-config /etc/php5/fpm/www.conf" +## Path: Network/WWW/php +## Description: FPM additional options +## Type: string +## Default: "" +## ServiceRestart: php-fpm +# +# Options for php-fpm +# +FPM_OPTIONS=""