diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2017-11-02 13:01:00 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2017-11-02 13:01:00 -0200 |
commit | 5f3ed06fc85c3c9cb8d80c03d157bcc29bf75798 (patch) | |
tree | 6e89619ec894e6649d31cfd6743211e5e2498d17 /manifests/init.pp | |
parent | 94fb97c148af076ea4c0e3ec710847b335761f30 (diff) | |
download | puppet-php-5f3ed06fc85c3c9cb8d80c03d157bcc29bf75798.tar.gz puppet-php-5f3ed06fc85c3c9cb8d80c03d157bcc29bf75798.tar.bz2 |
Support both PHP 5 and 7, defaults to 5
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 65 |
1 files changed, 6 insertions, 59 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index edd0c2b..3c699fc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,64 +16,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -class php($hardened = true) { - case $::lsbdistcodename { - 'xenial': { - include php::packages::ppa - } - 'stretch': { - include php::packages::dpa - } - default: { - include php::packages::default - } - } - - $folder = $::lsbdistcodename ? { - 'xenial' => '/etc/php/5.6', - 'stretch' => '/etc/php/5.6', - default => '/etc/php5', - } - - file { [ "${folder}", "${folder}/cli", "${folder}/apache2", "${folder}/cli/conf.d", "${folder}/apache2/conf.d" ]: - ensure => directory, - owner => root, - group => root, - mode => '0755', - require => Package['php5'], - } - - #file { "${folder}/cli/php.ini": - # ensure => present, - # owner => root, - # group => root, - # mode => '0644', - # source => [ "puppet:///modules/site_php/cli/${::fqdn}/php.ini", - # "puppet:///modules/site_php/cli/${::domain}/php.ini", - # "puppet:///modules/php/cli/php.${::operatingsystem}_${::lsbdistcodename}.ini", - # "puppet:///modules/php/cli/php.${::operatingsystem}.ini", - # "puppet:///modules/php/cli/php.ini" ], - # require => [ Package['php5'], File["${folder}/cli"] ], - #} - - #file { "${folder}/apache2/php.ini": - # ensure => present, - # owner => root, - # group => root, - # mode => '0644', - # source => [ "puppet:///modules/site_php/apache2/${::fqdn}/php.ini", - # "puppet:///modules/site_php/apache2/${::domain}/php.ini", - # "puppet:///modules/php/apache2/php.${::operatingsystem}_${::lsbdistcodename}.ini", - # "puppet:///modules/php/apache2/php.${::operatingsystem}.ini", - # "puppet:///modules/php/apache2/php.ini" ], - # notify => Service['apache2'], - # require => [ Package['php5'], File["${folder}/apache2"] ], - #} - - include php::resources - include php::defaults - - if $hardened == true { - include php::hardened +class php( + $series = '5', + $hardened = true, +){ + class { "php::series${series}": + hardened => $hardened, } } |