Adds php::folder param

diff --git a/manifests/config.pp b/manifests/config.pp
index b09a68b597afe379f386b810fddb4e802c07b32e..22ae8a86886eaf201b9e96ea1f980b4316c11a6c 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,5 +1,5 @@
 define php::config($key, $value, $ensure = 'present', $sapi = '') {
-  file { "/etc/php5/${sapi}/conf.d/${name}.ini":
+  file { "${::php::folder}/${sapi}/conf.d/${name}.ini":
     ensure  => $ensure,
     owner   => root,
     group   => root,

diff --git a/manifests/init.pp b/manifests/init.pp
index 78922653c48e1d0ba24578e2a719af5de1954c76..034801f84c54d1755a261b8b09b2f4145068b967 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,14 +26,19 @@ class php {
     }
   }
 
-  file { [ '/etc/php5', '/etc/php5/cli', '/etc/php5/apache2' ]:
+  $folder = ? $::lsbdistcodename {
+    'xenial' => '/etc/php',
+    default  => '/etc/php5',
+  },
+
+  file { [ "${folder}", "${folder}/cli", "${folder}/apache2" ]:
     ensure => directory,
     owner  => root,
     group  => root,
     mode   => 0755,
   }
 
-  file { '/etc/php5/cli/php.ini':
+  file { "${folder}/cli/php.ini":
     ensure  => present,
     owner   => root,
     group   => root,
@@ -43,10 +48,10 @@ class php {
                  "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['/etc/php5/cli'] ],
+    require => [ Package['php5'], File["${folder}/cli"] ],
   }
 
-  file { "/etc/php5/apache2/php.ini":
+  file { "${folder}/apache2/php.ini":
     ensure  => present,
     owner   => root,
     group   => root,
@@ -57,6 +62,6 @@ class php {
                  "puppet:///modules/php/apache2/php.${::operatingsystem}.ini",
                  "puppet:///modules/php/apache2/php.ini" ],
     notify  => Service['apache2'],
-    require => [ Package['php5'], File['/etc/php5/apache2'] ],
+    require => [ Package['php5'], File["${folder}/etc/php5/apache2'] ],
   }
 }