Updates packages and module definitions

4 files changed, 11 insertions, 5 deletions

diff --git a/manifests/config.pp b/manifests/config.pp
index ca307e3..e4d143e 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,4 +1,4 @@
-define php::config($series = '5', $order = '20', $value, $ensure = 'present', $sapi = 'apache2') {
+define php::config($series = '5', $order = '20', $param = $name, $value, $ensure = 'present', $sapi = 'apache2') {
   if $series == '5' {
     $version = $::php::series5::version
     $folder  = $::php::series5::folder
@@ -8,12 +8,12 @@ define php::config($series = '5', $order = '20', $value, $ensure = 'present', $s
     $folder  = $::php::series7::folder
   }
 
-  file { "${folder}/${sapi}/conf.d/${order}-${name}.ini":
+  file { "${folder}/${sapi}/conf.d/${order}-${param}.ini":
     ensure  => $ensure,
     owner   => root,
     group   => root,
     mode    => '0644',
-    content => "${name}=${value}\n",
+    content => "${param}=${value}\n",
     require => File["${folder}/${sapi}/conf.d"],
     notify  => $sapi ? {
       'apache2' => Service['apache2'],
diff --git a/manifests/series5.pp b/manifests/series5.pp
index 1625b16..307961a 100644
--- a/manifests/series5.pp
+++ b/manifests/series5.pp
@@ -69,4 +69,10 @@ class php::series5(
   if $hardened == true {
     include php::series5::hardened
   }
+
+  # The needed apache modules
+  #apache::module { "php${version}":
+  #  ensure  => present,
+  #  require => Package["libapache2-mod-php${version}"],
+  #}
 }
diff --git a/manifests/series7.pp b/manifests/series7.pp
index 9e2b094..f15a32a 100644
--- a/manifests/series7.pp
+++ b/manifests/series7.pp
@@ -25,7 +25,7 @@ class php::series7(
   }
 
   # The needed apache modules
-  #apache::module { 'php':
+  #apache::module { "php${version}":
   #  ensure  => present,
   #  require => Package["libapache2-mod-php${version}"],
   #}
diff --git a/manifests/series7/packages.pp b/manifests/series7/packages.pp
index 1e949b8..ab77253 100644
--- a/manifests/series7/packages.pp
+++ b/manifests/series7/packages.pp
@@ -1,7 +1,7 @@
 class php::series7::packages {
   $version = $::php::series7::version
 
-  package { [ 'php', 'php-mysql', 'php-sqlite3', 'php-cli', 'php-curl', 'php-gmp', "libapache2-mod-php${version}" ]:
+  package { [ 'php', 'php-mysql', "php-${version}-mysql", 'php-sqlite3', 'php-cli', 'php-curl', 'php-gmp', "libapache2-mod-php${version}" ]:
     ensure => installed,
   }