diff options
Diffstat (limited to 'manifests/series7')
| -rw-r--r-- | manifests/series7/defaults.pp | 6 | ||||
| -rw-r--r-- | manifests/series7/hardened.pp | 19 | ||||
| -rw-r--r-- | manifests/series7/packages.pp | 18 |
3 files changed, 26 insertions, 17 deletions
diff --git a/manifests/series7/defaults.pp b/manifests/series7/defaults.pp index 936d165..6d7e5b9 100644 --- a/manifests/series7/defaults.pp +++ b/manifests/series7/defaults.pp @@ -1,7 +1,7 @@ class php::series7::defaults { php::config { - 'error_reporting' : series => '7', value => 'E_ALL & ~E_NOTICE & ~E_STRICT'; - 'post_max_size' : series => '7', value => '100M'; - 'upload_max_filesize' : series => '7', value => '100M'; + 'error_reporting_7' : param => 'error_reporting', series => '7', value => 'E_ALL & ~E_NOTICE & ~E_STRICT'; + 'post_max_size_7' : param => 'post_max_size', series => '7', value => '100M'; + 'upload_max_filesize_7' : param => 'upload_max_filezise', series => '7', value => '100M'; } } diff --git a/manifests/series7/hardened.pp b/manifests/series7/hardened.pp index 2579f79..d0fb67c 100644 --- a/manifests/series7/hardened.pp +++ b/manifests/series7/hardened.pp @@ -1,20 +1,19 @@ class php::series7::hardened { $fpm = $::php::fpm $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' + #$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' if $fpm == 'present' { php::config { - '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; + 'allow_url_fopen_7_fpm' : param => 'allow_url_fopen', series => '7', sapi => 'fpm', value => 'Off'; + 'allow_url_include_7_fpm' : param => 'allow_url_include', series => '7', sapi => 'fpm', value => 'Off'; + 'disable_functions_7_fpm' : param => '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; - } + + php::config { + 'allow_url_fopen_7' : param => 'allow_url_fopen', series => '7', value => 'Off'; + 'allow_url_include_7' : param => 'allow_url_include', series => '7', value => 'Off'; + 'disable_functions_7' : param => 'disable_functions', series => '7', value => $disable_functions; } } diff --git a/manifests/series7/packages.pp b/manifests/series7/packages.pp index f4cef52..541ece3 100644 --- a/manifests/series7/packages.pp +++ b/manifests/series7/packages.pp @@ -1,12 +1,22 @@ -class php::series7::packages { - $version = $::php::series7::version +class php::series7::packages inherits php::packages { + $version = $::php::params::version7 - package { [ 'php', 'php-mysql', "php${version}-mysql", 'php-sqlite3', 'php-cli', 'php-curl', "php${version}-curl", 'php-gmp', "libapache2-mod-php${version}" ]: + package { [ "php${version}-common", "php${version}-mysql", "php${version}-cli", "php${version}-curl", 'php-gmp', "libapache2-mod-php${version}" ]: ensure => installed, } # Optional packages - package { [ "php-gd", "php${version}-gd", "php-imagick" ]: + package { [ "php${version}-gd" ]: ensure => installed, } + + # Default alternative + if $::php::default_cli == '7' { + file { "/etc/alternatives/php": + ensure => "/usr/bin/php${version}", + owner => root, + group => root, + require => Package["php${version}-cli"], + } + } } |