diff options
Diffstat (limited to 'manifests/series7.pp')
| -rw-r--r-- | manifests/series7.pp | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/manifests/series7.pp b/manifests/series7.pp index 97fddd2..64125f3 100644 --- a/manifests/series7.pp +++ b/manifests/series7.pp @@ -1,19 +1,30 @@ -class php::series7($hardened = true) { - $folder = '/etc/php/7.0' - - package { [ 'php', 'php-mysql', 'php-sqlite3', 'php-cli', 'php-curl', 'php-gmp', 'libapache2-mod-php7.0' ]: - ensure => installed, +class php::series7( + $hardened = true +) { + case $::lsbdistcodename { + 'xenial': { + include php::ppa + } + 'stretch': { + include php::dpa + } } - # Optional packages - package { [ "php-gd", "php-imagick" ]: - ensure => installed, + $version = '7.2' + $folder = "/etc/php/${version}" + + include php::packages + include php::resources + include php::series7::defaults + + if $hardened == true { + include php::series7::hardened } # The needed apache modules #apache::module { 'php': # ensure => present, - # require => Package['libapache2-mod-php7.0'], + # require => Package["libapache2-mod-php${version}"], #} file { [ "${folder}", "${folder}/cli", "${folder}/apache2", "${folder}/cli/conf.d", "${folder}/apache2/conf.d" ]: @@ -23,11 +34,4 @@ class php::series7($hardened = true) { mode => '0755', require => Package['php'], } - - include php::resources - include php::series7::defaults - - if $hardened == true { - include php::series7::hardened - } } |