FPM support at php::series7::hardened (3)

diff --git a/manifests/series7/hardened.pp b/manifests/series7/hardened.pp
index 296b8b144714ff6bc8fde07fe3e7cad2731759d2..2579f79ce5d0ea94147986f5ae04159635545c8c 100644 (file)
--- a/manifests/series7/hardened.pp
+++ b/manifests/series7/hardened.pp
@@ -3,17 +3,18 @@ class php::series7::hardened {
   $disable_functions = 'pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,phpinfo, system, exec, shell_exec, passthru, proc_get_status, proc_open, popen, proc_close, proc_nice, proc_terminate, pcntl_exec, proc_open, show_source, dl, symlink, system_exec'
   # $disable_functions = 'pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,phpinfo, system, exec, shell_exec, passthru, proc_get_status, proc_open, popen, proc_close, proc_nice, proc_terminate, pcntl_exec, proc_open, curl_init, parse_ini_file, show_source, dl, symlink, syslog, mail, system_exec'
 
-  php::config {
-    'allow_url_fopen'   : series => '7', value => 'Off';
-    'allow_url_include' : series => '7', value => 'Off';
-    'disable_functions' : series => '7', value => $disable_functions;
-  }
-
   if $fpm == 'present' {
     php::config {
-      'allow_url_fopen_fpm'   : name => 'allow_url_fopen',   series => '7', sapi => 'fpm', value => 'Off';
-      'allow_url_include_fpm' : name => 'allow_url_include', series => '7', sapi => 'fpm', value => 'Off';
-      'disable_functions_fpm' : name => 'disable_functions', series => '7', sapi => 'fpm', value => $disable_functions;
+      'allow_url_fopen'   : series => '7', sapi => 'fpm', value => 'Off';
+      'allow_url_include' : series => '7', sapi => 'fpm', value => 'Off';
+      'disable_functions' : series => '7', sapi => 'fpm', value => $disable_functions;
+    }
+  }
+  else {
+    php::config {
+      'allow_url_fopen'   : series => '7', value => 'Off';
+      'allow_url_include' : series => '7', value => 'Off';
+      'disable_functions' : series => '7', value => $disable_functions;
     }
   }
 }