Merge pull request #4 from EdwinHoksberg/smallFixes

LGTM Thanks

Author: GM-Alex

README.md

@@ -7,7 +7,7 @@ Puppet module for phpbrew.
 
 	phpbrew::install{ '5.3.27':
       $version = '',
-      $build_prameters = undef,
+      $build_parameters = undef,
       $php_inis = undef,
       $install_dir = '/opt/phpbrew',
     )
@@ -19,7 +19,7 @@ You can additional define the version (if the name should be different), the bui
 
 	phpbrew::install{ 'php-5.3.27':
       $version => '5.3.27',
-      $build_prameters => '+mysql',
+      $build_parameters => '+mysql',
       $php_inis => [
         '/etc/php5/mods-available/custom.ini'
       ],
@@ -29,7 +29,7 @@ You can additional define the version (if the name should be different), the bui
 Default values:
 
     $version = '',
-    $build_prameters = undef
+    $build_parameters = undef
     $php_inis = undef
     $install_dir = '/opt/phpbrew'
 
@@ -75,4 +75,4 @@ Default values:
 ## Copyright
 
 	Alexander Schneider - Jankowfsky AG
-	www.jankowfsky.com
+	www.jankowfsky.com

manifests/init.pp

@@ -14,14 +14,25 @@
 class phpbrew (
   $php_install_dir = '/opt/phpbrew'
 ) {
-  case $operatingsystem {
+  case $::operatingsystem {
     centos, redhat: {
       fail('CentOS or RedHat are not supported yet')
     }
     debian, ubuntu: {
       exec { '/usr/bin/apt-get -y update': }
 
-      $dependencies = [ 'autoconf', 'automake', 'curl', 'build-essential', 'libxslt1-dev', 're2c', 'libxml2-dev', 'php5-cli', 'libmcrypt-dev', 'php5-dev' ]
+      $dependencies = [
+        'autoconf',
+        'automake',
+        'curl',
+        'build-essential',
+        'libxslt1-dev',
+        're2c',
+        'libxml2-dev',
+        'php5-cli',
+        'libmcrypt-dev',
+        'php5-dev'
+      ]
 
       each($dependencies) |$dependency| {
         if ! defined(Package[$dependency]) {
@@ -56,37 +67,37 @@
 
   exec { 'init phpbrew':
     command     => '/usr/bin/sudo /usr/bin/phpbrew init',
-    creates     => "/root/.phpbrew/bashrc",
+    creates     => '/root/.phpbrew/bashrc',
     subscribe   => File['/usr/bin/phpbrew'],
     refreshonly => true,
   }
 
   file { $php_install_dir:
-    ensure => 'directory',
+    ensure  => 'directory',
     require => Exec['init phpbrew'],
   }
 
   # Specify where versions of PHP will be installed.
-  file { "/root/.phpbrew/init":
+  file { '/root/.phpbrew/init':
     content => "export PHPBREW_ROOT=${php_install_dir}",
     require => Exec['init phpbrew']
   }
 
   # Load phpbrew configuration by default.
   file_line { 'add phpbrew to bashrc':
-    path => '/root/.bashrc',
-    line => "source /root/.phpbrew/bashrc",
+    path    => '/root/.bashrc',
+    line    => 'source /root/.phpbrew/bashrc',
     require => Exec['init phpbrew'],
   }
 
   exec { 'update basbrc':
-    command => "/bin/bash"
+    command => '/bin/bash'
   }
 
-  file { "/root/.phpbrew/install_extension.sh":
+  file { '/root/.phpbrew/install_extension.sh':
     ensure  => present,
     mode    => 'a+x',
-    source  => "puppet:///modules/phpbrew/install_extension.sh",
+    source  => 'puppet:///modules/phpbrew/install_extension.sh',
     require => Exec['init phpbrew']
   }
 }

manifests/install.pp

@@ -16,7 +16,7 @@
 #
 define phpbrew::install(
   $version = '',
-  $build_prameters = undef,
+  $build_parameters = undef,
   $php_inis = undef,
   $install_dir = '/opt/phpbrew',
 ) {
@@ -28,29 +28,29 @@
     $php_version = $version
   }
 
-  if $build_prameters {
-    $extra_params = $build_prameters
+  if $build_parameters {
+    $extra_params = $build_parameters
   } elsif versioncmp($php_version, '5.3') < 0 {
     $extra_params = ''
   } else {
     $extra_params = ''
   }
 
   exec { "install php-${php_version}":
-    command     => "/usr/bin/sudo PHPBREW_ROOT=${install_dir} /usr/bin/phpbrew install --old php-${php_version} +default +intl ${extra_params}",
-    creates     => "${install_dir}/php/php-${php_version}/bin/php",
-    timeout     => 0,
+    command => "/usr/bin/sudo PHPBREW_ROOT=${install_dir} /usr/bin/phpbrew install --old php-${php_version} +default +intl ${extra_params}",
+    creates => "${install_dir}/php/php-${php_version}/bin/php",
+    timeout => 0,
   }
 
   file { "/usr/lib/cgi-bin/fcgiwrapper-${php_version}.sh":
-    ensure => present,
-    content => template("phpbrew/fcgiwrapper.sh.erb"),
+    ensure  => present,
+    content => template('phpbrew/fcgiwrapper.sh.erb'),
     mode    => 'a+x',
     require => Exec["install php-${php_version}"]
   }
 
   file { "${install_dir}/php/php-${php_version}/lib/php/share":
-    ensure  => "directory",
+    ensure  => 'directory',
     require => Exec["install php-${php_version}"]
   }
 
@@ -59,7 +59,7 @@
       "${install_dir}/php/php-${php_version}/var",
       "${install_dir}/php/php-${php_version}/var/db"
     ]:
-      ensure  => "directory",
+      ensure  => 'directory',
       require => Exec["install php-${php_version}"]
     }