Create a entry point class and enable customized php name

README.md

@@ -10,6 +10,7 @@ change everything in ways which are typical for RHEL, but it also works on
 Debian based distributions (such as Ubuntu), and support for others should
 be easy to add.
 
+* `php` : The entry point of the module
 * `php::cli` : Simple class to install PHP's Command Line Interface
 * `php::fpm::daemon` : Simple class to install PHP's FastCGI Process Manager
 * `php::fpm::conf` : PHP FPM pool configuration definition
@@ -20,6 +21,10 @@ be easy to add.
 
 ## Examples
 
+Declaring the `php` class
+
+    include php
+
 Create `php.ini` files for different uses, but based on the same template :
 
     php::ini { '/etc/php.ini':

manifests/cli.pp

@@ -9,8 +9,8 @@
 class php::cli (
   $ensure           = 'installed',
   $inifile          = '/etc/php.ini',
-  $cli_package_name = $::php::params::cli_package_name,
 ) inherits ::php::params {
+  $cli_package_name = "${::php::php_name}${::php::params::cli_package_suffix}"
   package { $cli_package_name:
     ensure  => $ensure,
     require => File[$inifile],

manifests/common.pp

@@ -6,7 +6,7 @@
 # We can't use a virtual resource, since we have no central place to put it.
 #
 class php::common (
-  $common_package_name = $::php::params::common_package_name,
 ) inherits ::php::params {
+  $common_package_name = "${::php::php_name}${::php::params::common_package_suffix}"
   package { $common_package_name: ensure => 'installed' }
 }

manifests/fpm/conf.pp

@@ -66,7 +66,7 @@
   $group_final = $group ? { undef => $user, default => $group }
 
   $fpm_package_name_final = $fpm_package_name ? {
-    undef   => $::php::params::fpm_package_name,
+    undef   => $::php::fpm::daemon::fpm_package_name,
     default => $fpm_package_name,
   }
 

manifests/fpm/daemon.pp

@@ -7,7 +7,6 @@
 #
 class php::fpm::daemon (
   $ensure                      = 'present',
-  $fpm_package_name            = $::php::params::fpm_package_name,
   $log_level                   = 'notice',
   $emergency_restart_threshold = '0',
   $emergency_restart_interval  = '0',
@@ -18,6 +17,7 @@
   $log_group                   = false,
   $log_dir_mode                = '0770',
 ) inherits ::php::params {
+  $fpm_package_name = "${::php::php_name}-fpm"
 
   # Hack-ish to default to user for group too
   $log_group_final = $log_group ? {

manifests/ini.pp

@@ -106,13 +106,9 @@
   $soap_wsdl_cache_dir        = '/tmp',
   $soap_wsdl_cache_ttl        = '86400',
 ) {
-
-  include '::php::common'
-
   file { $title:
     ensure  => $ensure,
     content => template($template),
   }
-
 }
 

manifests/init.pp

@@ -0,0 +1,4 @@
+class php (
+  $php_name = $::php::params::php_package_name,
+) inherits ::php::params {
+}

manifests/mod_php5.pp

@@ -12,7 +12,7 @@
   $inifile = '/etc/php.ini',
 ) inherits ::php::params {
 
-  package { $php_package_name:
+  package { $::php::php_name:
     ensure  => $ensure,
     require => File[$inifile],
     notify  => Service[$httpd_service_name],

manifests/module.pp

@@ -16,12 +16,12 @@
 
   # Manage the incorrect named php-apc package under Debians
   if ($title == 'apc') {
-    $package = $::php::params::php_apc_package_name
+    $package = "${::php::php_name}${::php::params::php_apc_package_suffix}"
   } else {
     # Hack to get pkg prefixes to work, i.e. php56-mcrypt title
     $package = $title ? {
       /^php/  => $title,
-      default => "${::php::params::php_package_name}-${title}"
+      default => "${::php::php_name}-${title}"
     }
   }
 

manifests/module/ini.pp

@@ -30,13 +30,13 @@
   # Handle naming issue of php-apc package on Debian
   if ($modname == 'apc' and $pkgname == false) {
     # Package name
-    $ospkgname = $::php::params::php_apc_package_name
+    $ospkgname = "${::php::php_name}${::php::params::php_apc_package_suffix}"
   } else {
     # Package name
     $ospkgname = $pkgname ? {
       /^php/  => "${pkgname}",
-      false   => "${::php::params::php_package_name}-${title}",
-      default => "${::php::params::php_package_name}-${pkgname}",
+      false   => "${::php::php_name}-${title}",
+      default => "${::php::php_name}-${pkgname}",
     }
   }
 

manifests/params.pp

@@ -2,9 +2,7 @@
   case $::osfamily {
     'Debian': {
       $php_package_name = 'php5'
-      $php_apc_package_name = 'php-apc'
-      $common_package_name = 'php5-common'
-      $cli_package_name = 'php5-cli'
+      $php_apc_package_suffix = '-apc'
       $php_conf_dir = '/etc/php5/conf.d'
       $fpm_package_name = 'php5-fpm'
       $fpm_service_name = 'php5-fpm'
@@ -18,9 +16,7 @@
     }
     default: {
       $php_package_name = 'php'
-      $php_apc_package_name = 'php-pecl-apc'
-      $common_package_name = 'php-common'
-      $cli_package_name = 'php-cli'
+      $php_apc_package_suffix = '-pecl-apc'
       $php_conf_dir = '/etc/php.d'
       $fpm_package_name = 'php-fpm'
       $fpm_service_name = 'php-fpm'
@@ -33,4 +29,7 @@
       $httpd_conf_dir = '/etc/httpd/conf.d'
     }
   }
+
+  $common_package_suffix = '-common'
+  $cli_package_suffix = '-cli'
 }

tests/cli.pp

@@ -1,2 +1,3 @@
+include php
 php::ini { '/etc/php.ini': }
 include php::cli

tests/fpm/conf.pp

@@ -1,3 +1,4 @@
+include php
 include php::fpm::daemon
 php::fpm::conf { 'www': ensure => absent }
 php::fpm::conf { 'customer1':

tests/fpm/daemon.pp

@@ -1 +1,2 @@
+include php
 include php::fpm::daemon

tests/mod_php5.pp

@@ -1,3 +1,4 @@
+include php
 php::ini { '/etc/php-httpd.ini': }
 service { 'httpd': }
 package { 'httpd': ensure => installed }

tests/module.pp

@@ -1 +1,2 @@
+include php
 php::module { [ 'ldap', 'mcrypt', 'xml' ]: }