aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp2
-rw-r--r--manifests/series5/packages.pp6
2 files changed, 1 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 3f8e075..b60d3df 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,7 +30,7 @@ class php(
ensure => $apc,
}
- php::fpm { $series:
+ php::fpm { "php-fpm-${series}":
series => $series,
ensure => $fpm,
}
diff --git a/manifests/series5/packages.pp b/manifests/series5/packages.pp
index 2d7e196..2b7dd3d 100644
--- a/manifests/series5/packages.pp
+++ b/manifests/series5/packages.pp
@@ -32,12 +32,6 @@ class php::series5::packages {
ensure => absent,
}
- # The needed apache modules
- apache::module { 'php5.6':
- ensure => present,
- require => [ Package['libapache2-mod-php5.6'], Apache::Module['php5'] ],
- }
-
# Default alternative
file { "/etc/alternatives/php":
ensure => "/usr/bin/php5.6",