Add loglevel parameter

Author: pennycoders

Modulefile

@@ -14,4 +14,4 @@ dependency 'puppetlabs/apt','>=1.0.0'
 dependency 'example42/php','>=2.0.17'
 dependency 'example42/puppi','>=1.0.0'
 
-version '1.0.60'
+version '1.0.61'

README.markdown

@@ -15,7 +15,8 @@
             compat_sys_deps=>false,
             zephir_build=>false,
             ini_file=>'phalcon.ini',
-            debug=>false
+            debug=>false,
+            loglevel=>'warning'
     }
 
 ### Gittip: ###
@@ -34,6 +35,7 @@
     zephir_build
     ini_file
     debug
+    loglevel 
 
 ### Prerequisites: ###
 

manifests/deps/devtools.pp

@@ -3,24 +3,27 @@
 # Parameters:
 # [*version*] - desired devtools version  - See https://github.com/phalcon/phalcon-devtools/branches for valid branch names
 class phalconphp::deps::devtools (
-  $version = '1.3.x',
-  $debug   = false) {
+  $version  = '1.3.x',
+  $debug    = false,
+  $loglevel = 'warning') {
   exec { 'git-clone-devtools':
     command   => "sudo git clone https://github.com/phalcon/phalcon-devtools.git -b ${version}",
     cwd       => "/usr/share/php",
     unless    => "test -d ./phalcon-devtools",
     require   => [
       Package['php'],
       Class['phalconphp::deps::sys']],
-    logoutput => $debug
+    logoutput => $debug,
+    loglevel  => $loglevel
   }
 
   exec { 'git-pull-devtools':
     command   => "sudo git pull",
     cwd       => "/usr/share/php/phalcon-devtools",
     onlyif    => "sudo test -d ./phalcon-devtools",
     require   => [Exec['git-clone-devtools']],
-    logoutput => $debug
+    logoutput => $debug,
+    loglevel  => $loglevel
   }
 
   file { '/usr/bin/phalcon':
@@ -30,22 +33,24 @@
     require  => [
       Class['phalconphp::framework'],
       Exec['git-pull-devtools']],
-    loglevel => 'notice'
+    loglevel => $loglevel
   }
 
   file { '/usr/share/php/phalcon-devtools':
-    ensure  => directory,
-    recurse => true,
-    owner   => 'www-data',
-    group   => 'www-data',
-    require => [Exec['git-pull-devtools']]
+    ensure   => directory,
+    recurse  => true,
+    owner    => 'www-data',
+    group    => 'www-data',
+    require  => [Exec['git-pull-devtools']],
+    loglevel => $loglevel
   }
 
   exec { 'chmod+x-devtools':
     command   => 'chmod ugo+x /usr/bin/phalcon',
     require   => [
       File['/usr/share/php/phalcon-devtools'],
       File['/usr/bin/phalcon']],
-    logoutput => $debug
+    logoutput => $debug,
+    loglevel  => $loglevel
   }
 }

manifests/deps/jsonc.pp

@@ -2,52 +2,61 @@
 # Installs json-c (https://github.com/json-c/json-c)
 
 class phalconphp::deps::jsonc (
-  $debug = false) {
+  $debug    = false,
+  $loglevel = 'warning') {
   include phalconphp::deps::sys
 
   exec { 'git-clone-json-c':
     command   => 'git clone https://github.com/json-c/json-c.git',
     cwd       => '/tmp',
     unless    => 'test -d /tmp/json-c',
+    require   => [Class['phalconphp::deps::sys']],
     logoutput => $debug,
-    require   => [Class['phalconphp::deps::sys']]
+    loglevel  => $loglevel
   } ->
   exec { 'git-pull-json-c':
     command   => 'git pull',
     cwd       => '/tmp/json-c',
     onlyif    => 'test -d /tmp/json-c',
     require   => [Exec['git-clone-json-c']],
-    logoutput => $debug
+    logoutput => $debug,
+    loglevel  => $loglevel
   } ->
   exec { 'autogen-json-c':
     command   => 'sh ./autogen.sh',
     cwd       => '/tmp/json-c',
-    logoutput => $debug,
     require   => [Exec['git-pull-json-c']],
+    logoutput => $debug,
+    loglevel  => $loglevel
   } ->
   exec { 'configure-json-c':
     command   => '/tmp/json-c/configure',
     cwd       => '/tmp/json-c',
     onlyif    => 'test -f /tmp/json-c/configure',
     require   => [Exec['autogen-json-c']],
-    logoutput => $debug
+    logoutput => $debug,
+    loglevel  => $loglevel
   } ->
   exec { 'make-json-c':
     command   => "make -j${::processorcount}",
     cwd       => '/tmp/json-c',
     require   => [Exec['configure-json-c']],
-    logoutput => true
+    logoutput => $debug,
+    loglevel  => $loglevel
   } ->
   exec { 'install-json-c':
     command   => "sudo make -j${::processorcount} install",
     cwd       => '/tmp/json-c',
+    require   => [Exec['make-json-c']],
     logoutput => $debug,
-    require   => [Exec['make-json-c']]
+    loglevel  => $loglevel
   } ->
   exec { 'remove-json-c-source':
-    cwd     => '/tmp',
-    command => 'rm ./json-c -R -f',
-    onlyif  => 'test -d /tmp/json-c',
-    require => [Exec['install-json-c']]
+    cwd       => '/tmp',
+    command   => 'rm ./json-c -R -f',
+    onlyif    => 'test -d /tmp/json-c',
+    require   => [Exec['install-json-c']],
+    logoutput => $debug,
+    loglevel  => $loglevel
   }
 }

manifests/deps/sys.pp

@@ -1,7 +1,8 @@
 # Class: phalconphp::deps::sys
 # Installs gcc, make, automake, autoconf, re2c, pcre, pcre-devel, libcurl, libcurl-devel, wget
 class phalconphp::deps::sys (
-  $each_compat = false) {
+  $each_compat = false,
+  $loglevel    = 'warning') {
   case $::osfamily {
     'RedHat' : { # Define the package names for rhel
       case $::operatingsystem {
@@ -55,11 +56,17 @@
   }
 
   if $each_compat == true {
-    package { $phalcon_deps: ensure => present }
+    package { $phalcon_deps:
+      ensure   => present,
+      loglevel => $loglevel
+    }
   } else {
     each($phalcon_deps) |$phalcon_dep| {
       if defined(Package[$phalcon_dep]) == false {
-        package { $phalcon_dep: ensure => present }
+        package { $phalcon_dep:
+          ensure   => present,
+          loglevel => $loglevel
+        }
       }
     }
   }

manifests/deps/zephir.pp

@@ -1,31 +1,39 @@
 # Class: phalconphp::deps::zephir
 # Installs Zephir (http://zephir-lang.com/)
 class phalconphp::deps::zephir (
-  $debug = false) {
-  class { 'phalconphp::deps::jsonc': debug => $debug }
+  $debug    = false,
+  $loglevel = 'warning') {
+  class { 'phalconphp::deps::jsonc':
+    debug    => $debug,
+    loglevel => $loglevel
+  }
 
   exec { 'git-clone-zephir':
     command   => 'git clone https://github.com/phalcon/zephir.git',
     cwd       => '/tmp',
     unless    => 'test -d /tmp/zephir',
     require   => [Class['phalconphp::deps::sys']],
-    logoutput => $debug
+    logoutput => $debug,
+    loglevel  => $loglevel
   } ->
   exec { 'git-pull-zephir':
     command   => 'git pull',
     cwd       => '/tmp/zephir',
     onlyif    => 'test -d /tmp/zephir',
-    logoutput => $debug
+    logoutput => $debug,
+    loglevel  => $loglevel
   } ->
   exec { 'install-zephir':
     command   => './install -c',
     cwd       => '/tmp/zephir',
     require   => [Class['phalconphp::deps::jsonc']],
     logoutput => $debug,
+    loglevel  => $loglevel
   } ->
   exec { 'check-zephir':
     command   => 'zephir version',
     logoutput => $debug,
-    require   => [Exec['install-zephir']]
+    require   => [Exec['install-zephir']],
+    loglevel  => $loglevel
   }
 }

manifests/framework.pp

@@ -4,26 +4,29 @@
   $version,
   $zephir_build = false,
   $ini_file     = "phalcon.ini",
-  $debug        = false) {
+  $debug        = false,
+  $loglevel     = 'warning') {
   exec { 'git-clone-phalcon':
     command   => "git clone -b ${version} https://github.com/phalcon/cphalcon.git",
     cwd       => '/tmp',
     require   => [Class['phalconphp::deps::sys']],
     unless    => 'test -d /tmp/cphalcon',
-    logoutput => $debug
+    logoutput => $debug,
+    loglevel  => $loglevel
   } ->
   exec { 'git-pull-phalcon':
     command   => 'git pull',
     cwd       => '/tmp/cphalcon',
     onlyif    => 'test -d /tmp/cphalcon',
     require   => [Exec['git-clone-phalcon']],
-    logoutput => $debug
+    logoutput => $debug,
+    loglevel  => $loglevel
   }
 
   file { "${php::config_dir}/${ini_file}":
     ensure   => file,
     require  => [Class['php']],
-    loglevel => 'notice'
+    loglevel => $loglevel
   }
 
   if $version == '2.0.0' or $version == 'dev' {
@@ -35,30 +38,34 @@
           Class['phalconphp::deps::zephir'],
           Exec['git-pull-phalcon']],
         onlyif    => 'test -f /tmp/cphalcon/config.json',
-        logoutput => $debug
+        logoutput => $debug,
+        loglevel  => $loglevel
       }
 
       exec { 'install-phalcon-2.0':
         command   => 'zephir build',
         cwd       => '/tmp/cphalcon',
         require   => [Exec['generate-phalcon-2.0']],
-        logoutput => $debug
+        logoutput => $debug,
+        loglevel  => $loglevel
       }
     } else {
       exec { 'install-phalcon-2.0':
         command   => "/tmp/cphalcon/ext/install-test",
         cwd       => '/tmp/cphalcon/ext',
         require   => [Exec['git-pull-phalcon']],
         onlyif    => 'test -f /tmp/cphalcon/ext/install-test',
-        logoutput => $debug
+        logoutput => $debug,
+        loglevel  => $loglevel
       }
     }
 
     exec { 'remove-phalcon-src-2.0':
       cwd       => '/tmp',
       command   => 'rm ./cphalcon -R -f',
       require   => [Exec['install-phalcon-2.0']],
-      logoutput => $debug
+      logoutput => $debug,
+      loglevel  => $loglevel
     }
 
     php::augeas { 'php-load-phalcon-2.0':
@@ -68,15 +75,16 @@
       require  => [
         File["${php::config_dir}/${ini_file}"],
         Exec['remove-phalcon-src-2.0']],
-      loglevel => 'notice'
+      loglevel => $loglevel
     }
   } else {
     exec { 'install-phalcon-1.x':
       command   => 'sudo ./install',
       cwd       => '/tmp/cphalcon/build',
       onlyif    => 'test -f /tmp/cphalcon/build/install',
       require   => [Exec['git-pull-phalcon']],
-      logoutput => $debug
+      logoutput => $debug,
+      loglevel  => $loglevel
     }
 
     exec { 'remove-phalcon-src-1.x':
@@ -85,7 +93,8 @@
       require   => [
         Exec['git-pull-phalcon'],
         Exec['install-phalcon-1.x']],
-      logoutput => $debug
+      logoutput => $debug,
+      loglevel  => $loglevel
     }
 
     php::augeas { 'php-load-phalcon-1.x':
@@ -95,7 +104,7 @@
       require  => [
         File["${php::config_dir}/${ini_file}"],
         Exec['remove-phalcon-src-1.x']],
-      loglevel => 'notice'
+      loglevel => $loglevel
     }
   }
 }