Update module file

Update readme file
Add parameter for install path
Add php ini parameter

Author: Alexander Schneider

Modulefile

@@ -1,4 +1,4 @@
-name 'phpbrew'
+name 'puppet-phpbrew'
 version '1.0.1'
 author 'Jankowfsky AG - Alexander Schneider'
 description 'Puppet module for phpbrew.'

README.md

@@ -5,30 +5,55 @@ Puppet module for phpbrew.
 
 ## Usage
 
-	class { 'phpdecoder':
-		$php_version => '5.3',
-		$type        => 'zend',
-	}
+	phpbrew::install{ '5.3.27':
+      $version = '',
+      $build_prameters = undef,
+      $php_inis = undef,
+      $install_dir = '/opt/phpbrew',
+    )
 
 
 ## Configuration
 
-You can additional define apache modules and php conf.d directory:
+You can additional define the version (if the name should be different), the build parameters, the php ini files you want to copy and the install directory:
 
-	class { 'phpdecoder':
-	    $php_version => '5.3',
-	    $type        => 'zend',
-		$modules_dir => '/etc/apache2/modules/zgl/',
-        $php_ini_dir => '/etc/php5/apache2/conf.d/'
-	}
+	phpbrew::install{ 'php-5.3.27':
+      $version => '5.3.27',
+      $build_prameters => '+mysql',
+      $php_inis => [
+        '/etc/php5/mods-available/custom.ini'
+      ],
+      $install_dir => '/opt/custom_dir',
+    )
 
+Default values:
+
+    $version = '',
+    $build_prameters = undef
+    $php_inis = undef
+    $install_dir = '/opt/phpbrew'
+
+
+## Install php extension
+
+### Usage
+
+    define phpbrew::extension{ 'xdebug':
+      $php_version = '5.3.27',
+    )
+
+Note the php version is required and the php version must be installed by php brew.
+
+
+### Configuration
+
+You can additional define the extension name (if the name should be different), the version (if now version is given the latest will used), the build parameters and the install directory:
 
 Default values:
 
-    $php_version = '5.3'
-    $type        = 'zend'
-    $modules_dir = '/etc/apache2/modules/zgl/'
-    $php_ini_dir = '/etc/php5/apache2/conf.d/'
+    $extension = undef
+    $version = undef
+    $install_dir = '/opt/phpbrew'
 
 
 ## License

manifests/extension.pp

@@ -17,7 +17,8 @@
 define phpbrew::extension(
   $extension = undef,
   $php_version = undef,
-  $version = undef
+  $version = undef,
+  $install_dir = '/opt/phpbrew',
 ) {
   if ! $extension {
     $extension_name = $title
@@ -32,7 +33,7 @@
       command => "/root/.phpbrew/install_extension.sh ${php_version} ${extension_name} ${version}",
       timeout => 0,
       user    => 'root',
-      creates => "/opt/phpbrew/php/php-${php_version}/var/db/${extension_name}.ini",
+      creates => "${install_dir}/php/php-${php_version}/var/db/${extension_name}.ini",
       notify  => Service['httpd']
     }
   }

manifests/init.pp

@@ -12,7 +12,7 @@
 #  class { 'phpbrew': }
 #
 class phpbrew (
-
+  $php_install_dir = '/opt/phpbrew'
 ) {
   case $operatingsystem {
     centos, redhat: {
@@ -61,14 +61,14 @@
     refreshonly => true,
   }
 
-  file { '/opt/phpbrew':
+  file { $php_install_dir:
     ensure => 'directory',
     require => Exec['init phpbrew'],
   }
 
   # Specify where versions of PHP will be installed.
   file { "/root/.phpbrew/init":
-    content => 'export PHPBREW_ROOT=/opt/phpbrew',
+    content => "export PHPBREW_ROOT=${php_install_dir}",
     require => Exec['init phpbrew']
   }
 

manifests/install.pp

@@ -16,7 +16,9 @@
 #
 define phpbrew::install(
   $version = '',
-  $default_path = '/opt/phpbrew'
+  $build_prameters = undef,
+  $php_inis = undef,
+  $install_dir = '/opt/phpbrew',
 ) {
   require phpbrew
 
@@ -26,15 +28,17 @@
     $php_version = $version
   }
 
-  if versioncmp($php_version, '5.3') < 0 {
-    $extra_params  = ''
+  if $build_prameters {
+    $extra_params = $build_prameters
+  } elsif versioncmp($php_version, '5.3') < 0 {
+    $extra_params = ''
   } else {
-    $extra_params  = ''
+    $extra_params = ''
   }
 
   exec { "install php-${php_version}":
-    command     => "sudo PHPBREW_ROOT=${$default_path} /usr/bin/phpbrew install --old php-${php_version} +default +intl +cgi ${extra_params}",
-    creates     => "${default_path}/php/php-${php_version}/bin/php",
+    command     => "sudo PHPBREW_ROOT=${install_dir} /usr/bin/phpbrew install --old php-${php_version} +default +intl +cgi ${extra_params}",
+    creates     => "${install_dir}/php/php-${php_version}/bin/php",
     timeout     => 0,
   }
 
@@ -44,4 +48,29 @@
     mode    => 'a+x',
     require => Exec["install php-${php_version}"]
   }
+
+  file { "${install_dir}/php/php-${php_version}/lib/php/share":
+    ensure  => "directory",
+    require => Exec["install php-${php_version}"]
+  }
+
+  if $php_inis != undef {
+    file { [
+      "${install_dir}/php/php-${php_version}/var",
+      "${install_dir}/php/php-${php_version}/var/db"
+    ]:
+      ensure  => "directory",
+      require => Exec["install php-${php_version}"]
+    }
+
+    each($php_inis) |$php_ini| {
+      $short_php_ini = regsubst($php_ini, '^.*\/([^\/]*\.ini)$', '\1')
+
+      file { "${install_dir}/php/php-${php_version}/var/db/${short_php_ini}":
+        source  => $php_ini,
+        require => File["${install_dir}/php/php-${php_version}/var/db"]
+      }
+    }
+  }
+
 }

templates/fcgiwrapper.sh.erb

@@ -8,4 +8,4 @@ export PHP_FCGI_CHILDREN
 PHP_FCGI_MAX_REQUESTS=10000
 export PHP_FCGI_MAX_REQUESTS
 
-exec <%= @default_path %>/php/php-<%= @php_version %>/bin/php-cgi
+exec <%= @install_dir %>/php/php-<%= @php_version %>/bin/php-cgi