Merge branch 'master' into xmlrpc-php

schkovich · schkovich · commit ee76f5426d6d · 2016-02-19T10:55:39.000+01:00
diff --git a/lib/augeas/lenses/php.aug b/lib/augeas/lenses/php.aug
diff --git a/manifests/augeas.pp b/manifests/augeas.pp
diff --git a/manifests/config/augeas.pp b/manifests/config/augeas.pp
@@ -3,14 +3,11 @@
   $file,
   $config,
 ) {
-  include php::augeas
   include php::params
 
   augeas { "php-${name}-config":
-    incl      => $file,
-    changes   => $config,
-    load_path => $php::params::augeas_contrib_dir,
-    lens      => 'PHP.lns',
-    require   => Class['php::augeas']
+    incl    => $file,
+    changes => $config,
+    lens    => 'PHP.lns',
   }
 }
diff --git a/manifests/extension/apc/params.pp b/manifests/extension/apc/params.pp
@@ -59,6 +59,8 @@
   }
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/apc.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "apc.so"'
+  ]
 
 }
diff --git a/manifests/extension/apcu/params.pp b/manifests/extension/apcu/params.pp
@@ -44,5 +44,7 @@
   $package  = 'php5-apcu'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/apcu.ini"
-  $settings = []
+  $settings = [
+    'set ".anon/extension" "apcu.so"'
+  ]
 }
diff --git a/manifests/extension/curl/params.pp b/manifests/extension/curl/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-curl'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/curl.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "curl.so"'
+  ]
 
 }
diff --git a/manifests/extension/gd/params.pp b/manifests/extension/gd/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-gd'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/gd.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "gd.so"'
+  ]
 
 }
diff --git a/manifests/extension/gearman/params.pp b/manifests/extension/gearman/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-gearman'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/gearman.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "gearman.so"'
+  ]
 
 }
diff --git a/manifests/extension/http/params.pp b/manifests/extension/http/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-http'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/http.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "http.so"'
+  ]
 
 }
diff --git a/manifests/extension/imagick/params.pp b/manifests/extension/imagick/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-imagick'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/imagick.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "imagick.so"'
+  ]
 
 }
diff --git a/manifests/extension/imap/params.pp b/manifests/extension/imap/params.pp
@@ -43,6 +43,8 @@
   $ensure   = $php::params::ensure
   $package  = 'php5-imap'
   $provider = undef
-  $inifile  = '/etc/php5/conf.d/20-imap.ini'
-  $settings = []
+  $inifile  = "${php::params::config_root_ini}/imap.ini"
+  $settings = [
+    'set ".anon/extension" "imap.so"'
+  ]
 }
diff --git a/manifests/extension/intl/params.pp b/manifests/extension/intl/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-intl'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/intl.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "intl.so"'
+  ]
 
 }
diff --git a/manifests/extension/ldap/params.pp b/manifests/extension/ldap/params.pp
@@ -43,6 +43,8 @@
   $ensure   = $php::params::ensure
   $package  = 'php5-ldap'
   $provider = undef
-  $inifile  = '/etc/php5/conf.d/20-ldap.ini'
-  $settings = []
+  $inifile  = "${php::params::config_root_ini}/ldap.ini"
+  $settings = [
+    'set ".anon/extension" "ldap.so"'
+  ]
 }
diff --git a/manifests/extension/mcrypt/params.pp b/manifests/extension/mcrypt/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-mcrypt'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/mcrypt.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "mcrypt.so"'
+  ]
 
 }
diff --git a/manifests/extension/memcache/params.pp b/manifests/extension/memcache/params.pp
@@ -44,7 +44,9 @@
   $ensure   = $php::params::ensure
   $package  = 'php5-memcache'
   $provider = undef
-  $inifile  = '/etc/php5/conf.d/20-memcache.ini'
-  $settings = []
+  $inifile  = "${php::params::config_root_ini}/memcache.ini"
+  $settings = [
+    'set ".anon/extension" "memcache.so"'
+  ]
 
 }
diff --git a/manifests/extension/memcached/params.pp b/manifests/extension/memcached/params.pp
@@ -44,7 +44,9 @@
   $ensure   = $php::params::ensure
   $package  = 'php5-memcached'
   $provider = undef
-  $inifile  = '/etc/php5/conf.d/20-memcached.ini'
-  $settings = []
+  $inifile  = "${php::params::config_root_ini}/memcached.ini"
+  $settings = [
+    'set ".anon/extension" "memcached.so"'
+  ]
 
 }
diff --git a/manifests/extension/mysql/params.pp b/manifests/extension/mysql/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-mysql'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/mysql.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "mysql.so"'
+  ]
 
 }
diff --git a/manifests/extension/mysqlnd/params.pp b/manifests/extension/mysqlnd/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-mysqlnd'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/mysqlnd.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "mysqlnd.so"'
+  ]
 
 }
diff --git a/manifests/extension/newrelic/params.pp b/manifests/extension/newrelic/params.pp
@@ -44,6 +44,8 @@
   $package  = 'newrelic-php5'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/newrelic.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "newrelic.so"'
+  ]
 
 }
diff --git a/manifests/extension/opcache/params.pp b/manifests/extension/opcache/params.pp
@@ -44,6 +44,8 @@
   $package  = undef
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/opcache.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "opcache.so"'
+  ]
 
 }
diff --git a/manifests/extension/pgsql/params.pp b/manifests/extension/pgsql/params.pp
@@ -44,5 +44,7 @@
   $package  = 'php5-pgsql'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/pgsql.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "pgsql.so"'
+  ]
 }
diff --git a/manifests/extension/redis/params.pp b/manifests/extension/redis/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-redis'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/redis.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "redis.so"'
+  ]
 
 }
diff --git a/manifests/extension/solr.pp b/manifests/extension/solr.pp
@@ -0,0 +1,61 @@
+# == Class: php::extension::solr
+#
+# Install the solr PHP extension
+#
+# === Parameters
+#
+# [*ensure*]
+#   The version of the package to install
+#   Could be "latest", "installed" or a pinned version
+#   This matches "ensure" from Package
+#
+# [*package*]
+#   The package name in your provider
+#
+# [*provider*]
+#   The provider used to install the package
+#
+# [*inifile*]
+#   The path to the extension ini file
+#
+# [*settings*]
+#   Hash with 'set' nested hash of key => value
+#   set changes to agues when applied to *inifile*
+#
+# === Variables
+#
+# No variables
+#
+# === Examples
+#
+#  include php::extension::solr
+#
+# === Authors
+#
+# Christian "Jippi" Winther <jippignu@gmail.com>
+# Goran Miskovic <schkovich@gmail.com>
+#
+# === Copyright
+#
+# Copyright 2012-2015 Christian "Jippi" Winther, unless otherwise noted.
+#
+class php::extension::solr(
+  $ensure   = $php::extension::solr::params::ensure,
+  $package  = $php::extension::solr::params::package,
+  $provider = $php::extension::solr::params::provider,
+  $inifile  = $php::extension::solr::params::inifile,
+  $settings = $php::extension::solr::params::settings
+) inherits php::extension::solr::params {
+
+  php::extension { 'solr':
+    ensure   => $ensure,
+    package  => $package,
+    provider => $provider
+  }
+  ->
+  php::config { 'php-extension-solr':
+    file   => $inifile,
+    config => $settings
+  }
+
+}
diff --git a/manifests/extension/solr/params.pp b/manifests/extension/solr/params.pp
@@ -0,0 +1,52 @@
+# == Class: php::extension::tidy::params
+#
+# Defaults file for the tidy PHP extension
+#
+# === Parameters
+#
+# No parameters
+#
+# === Variables
+#
+# [*ensure*]
+#   The version of the package to install
+#   Could be "latest", "installed" or a pinned version
+#   This matches "ensure" from Package
+#
+# [*package*]
+#   The package name in your provider
+#
+# [*provider*]
+#   The provider used to install the package
+#
+# [*inifile*]
+#   The path to the extension ini file
+#
+# [*settings*]
+#   Hash with 'set' nested hash of key => value
+#   set changes to agues when applied to *inifile*
+#
+# === Examples
+#
+# No examples
+#
+# === Authors
+#
+# Christian "Jippi" Winther <jippignu@gmail.com>
+# Goran Miskovic <schkovich@gmail.com>
+#
+# === Copyright
+#
+# Copyright 2012-2015 Christian "Jippi" Winther, unless otherwise noted.
+#
+class php::extension::solr::params {
+
+  $ensure   = $php::params::ensure
+  $package  = 'solr'
+  $provider = 'pecl'
+  $inifile  = "${php::params::config_root_ini}/solr.ini"
+  $settings = [
+    'set ".anon/extension" "solr.so"'
+  ]
+
+}
diff --git a/manifests/extension/sqlite/params.pp b/manifests/extension/sqlite/params.pp
@@ -44,5 +44,7 @@
   $package  = 'php5-sqlite'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/sqlite.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "sqlite.so"'
+  ]
 }
diff --git a/manifests/extension/ssh2/params.pp b/manifests/extension/ssh2/params.pp
@@ -44,6 +44,8 @@
   $package  = 'php5-ssh2'
   $provider = undef
   $inifile  = "${php::params::config_root_ini}/ssh2.ini"
-  $settings = [ ]
+  $settings = [
+    'set ".anon/extension" "ssh2.so"'
+  ]
 
 }
diff --git a/manifests/extension/tidy/params.pp b/manifests/extension/tidy/params.pp
diff --git a/manifests/extension/xcache/params.pp b/manifests/extension/xcache/params.pp
diff --git a/manifests/extension/xdebug/params.pp b/manifests/extension/xdebug/params.pp
diff --git a/manifests/extension/xhprof/params.pp b/manifests/extension/xhprof/params.pp
diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp
diff --git a/metadata.json b/metadata.json
diff --git a/templates/fpm/php-fpm.conf.erb b/templates/fpm/php-fpm.conf.erb
diff --git a/templates/fpm/pool.conf.erb b/templates/fpm/pool.conf.erb

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@`
`59`	`59`	`}`
`60`	`60`	`$provider = undef`
`61`	`61`	`$inifile = "${php::params::config_root_ini}/apc.ini"`
`62`		`- $settings = [ ]`
	`62`	`+ $settings = [`
	`63`	`+ 'set ".anon/extension" "apc.so"'`
	`64`	`+ ]`
`63`	`65`
`64`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,7 @@`
`44`	`44`	`$package = 'php5-apcu'`
`45`	`45`	`$provider = undef`
`46`	`46`	`$inifile = "${php::params::config_root_ini}/apcu.ini"`
`47`		`- $settings = []`
	`47`	`+ $settings = [`
	`48`	`+ 'set ".anon/extension" "apcu.so"'`
	`49`	`+ ]`
`48`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@`
`44`	`44`	`$package = 'php5-curl'`
`45`	`45`	`$provider = undef`
`46`	`46`	`$inifile = "${php::params::config_root_ini}/curl.ini"`
`47`		`- $settings = [ ]`
	`47`	`+ $settings = [`
	`48`	`+ 'set ".anon/extension" "curl.so"'`
	`49`	`+ ]`
`48`	`50`
`49`	`51`	`}`