Merge remote-tracking branch 'origin/master' into jenkins-build-9

manifests/params.pp

@@ -4,15 +4,11 @@
 # @summary Class contains all class parameters for this module
 # @param [String] reqpackages which packages to install
 # @param [String] pkg_ensure which version of packages to install
-# @param [String] php_max_execution_time maximum execution time for PHP scripts
 ##############################################################################
 class confdroid_php::params (
 
-  String $reqpackages             = 'php',
-  String $pkg_ensure              = 'present',
-
-# php.ini
-  String $php_max_execution_time  = '30',
+  String $reqpackages = 'php',
+  String $pkg_ensure  = 'present',
 
 ) {
 # Facts

templates/php.ini.erb

@@ -411,7 +411,7 @@ expose_php = On
 ; Maximum execution time of each script, in seconds
 ; http://php.net/max-execution-time
 ; Note: This directive is hardcoded to 0 for the CLI SAPI
-max_execution_time = <%= @php_max_execution_time %>
+max_execution_time = 30
 
 ; Maximum amount of time each script may spend parsing request data. It's a good
 ; idea to limit this time on productions servers in order to eliminate unexpectedly