jippi/puppet-php — pull request #44 by janschumann (2014-01-21 20:42:45+00:00)
Title: php::fpm::daemon can now be used in conjunction with php::fpm

The Package and Service resources for php5-fpm where defined multiple times. For that reason ::php::fpm (which defines the fpm.ini file) and ::php::fpm::daemon (which sets up the service and the fpm.conf) could not be used both. This should now be fixed.