Skip to content
This repository has been archived by the owner on Oct 11, 2018. It is now read-only.

Commit

Permalink
Merge pull request #156 from RewardGateway/master
Browse files Browse the repository at this point in the history 
Ensure greater consistency between php extensions
  • Loading branch information
@igalic
igalic committed Oct 28, 2015
2 parents 6d074de + 332a90e commit 663a496
Show file tree
Hide file tree
Showing 26 changed files with 77 additions and 36 deletions.
4 changes: 3 additions & 1 deletion manifests/extension/apc/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
}
$provider = undef
$inifile = "${php::params::config_root_ini}/apc.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "apc.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/apcu/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@
$package = 'php5-apcu'
$provider = undef
$inifile = "${php::params::config_root_ini}/apcu.ini"
$settings = []
$settings = [
'set ".anon/extension" "apcu.so"'
]
}
4 changes: 3 additions & 1 deletion manifests/extension/curl/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-curl'
$provider = undef
$inifile = "${php::params::config_root_ini}/curl.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "curl.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/gd/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-gd'
$provider = undef
$inifile = "${php::params::config_root_ini}/gd.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "gd.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/gearman/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-gearman'
$provider = undef
$inifile = "${php::params::config_root_ini}/gearman.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "gearman.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/http/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-http'
$provider = undef
$inifile = "${php::params::config_root_ini}/http.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "http.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/imagick/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-imagick'
$provider = undef
$inifile = "${php::params::config_root_ini}/imagick.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "imagick.so"'
]

}
6 changes: 4 additions & 2 deletions manifests/extension/imap/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"'
]
}
4 changes: 3 additions & 1 deletion manifests/extension/intl/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-intl'
$provider = undef
$inifile = "${php::params::config_root_ini}/intl.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "intl.so"'
]

}
6 changes: 4 additions & 2 deletions manifests/extension/ldap/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"'
]
}
4 changes: 3 additions & 1 deletion manifests/extension/mcrypt/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-mcrypt'
$provider = undef
$inifile = "${php::params::config_root_ini}/mcrypt.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "mcrypt.so"'
]

}
6 changes: 4 additions & 2 deletions manifests/extension/memcache/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"'
]

}
6 changes: 4 additions & 2 deletions manifests/extension/memcached/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/mysql/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-mysql'
$provider = undef
$inifile = "${php::params::config_root_ini}/mysql.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "mysql.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/mysqlnd/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-mysqlnd'
$provider = undef
$inifile = "${php::params::config_root_ini}/mysqlnd.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "mysqlnd.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/newrelic/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'newrelic-php5'
$provider = undef
$inifile = "${php::params::config_root_ini}/newrelic.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "newrelic.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/opcache/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = undef
$provider = undef
$inifile = "${php::params::config_root_ini}/opcache.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "opcache.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/pgsql/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@
$package = 'php5-pgsql'
$provider = undef
$inifile = "${php::params::config_root_ini}/pgsql.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "pgsql.so"'
]
}
4 changes: 3 additions & 1 deletion manifests/extension/redis/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-redis'
$provider = undef
$inifile = "${php::params::config_root_ini}/redis.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "redis.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/solr/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
$package = 'solr'
$provider = 'pecl'
$inifile = "${php::params::config_root_ini}/solr.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "solr.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/sqlite/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@
$package = 'php5-sqlite'
$provider = undef
$inifile = "${php::params::config_root_ini}/sqlite.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "sqlite.so"'
]
}
4 changes: 3 additions & 1 deletion manifests/extension/ssh2/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-ssh2'
$provider = undef
$inifile = "${php::params::config_root_ini}/ssh2.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "ssh2.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/tidy/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
$package = 'php5-tidy'
$provider = undef
$inifile = "${php::params::config_root_ini}/tidy.ini"
$settings = [ ]
$settings = [
'set ".anon/extension" "tidy.so"'
]

}
4 changes: 3 additions & 1 deletion manifests/extension/xcache/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
$package = 'php5-xcache'
$provider = undef
$inifile = "${php::params::config_root_ini}/xcache.ini"
$settings = []
$settings = [
'set ".anon/extension" "xcache.so"'
]

}
6 changes: 1 addition & 5 deletions manifests/extension/xdebug/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
# [*provider*]
# The provider used to install the package
#
# [*install_dir*]
# The path of the installed xdebug.so binary
#
# [*inifile*]
# The path to the extension ini file
#
Expand All @@ -46,10 +43,9 @@
$ensure = $php::params::ensure
$package = 'php5-xdebug'
$provider = undef
$install_dir = "/usr/lib/php5/${::php_extension_version}"
$inifile = "${php::params::config_root_ini}/xdebug.ini"
$settings = [
"set .anon/zend_extension '${install_dir}/xdebug.so'"
'set ".anon/zend_extension" "xdebug.so"'
]

}
3 changes: 0 additions & 3 deletions manifests/extension/xhprof/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
# [*provider*]
# The provider used to install the package
#
# [*install_dir*]
# The path of the installed xhprof.so binary
#
# [*inifile*]
# The path to the extension ini file
#
Expand Down

0 comments on commit 663a496

Please sign in to comment.