Merge pull request voxpupuli#265 from MiamiOH/manage_curl

Ability to manage my own curl

Author: dhoppe

manifests/composer.pp

@@ -11,6 +11,9 @@
 # [*environment*]
 #   Environment variables for settings such as http_proxy, https_proxy, or ftp_proxy
 #
+# [*manage_curl*]
+#   Should we ensure curl is installed or do you want to manage that?
+#
 # [*auto_update*]
 #   Defines if composer should be auto updated
 #
@@ -24,6 +27,7 @@
   $source      = $::php::params::composer_source,
   $path        = $::php::params::composer_path,
   $environment = undef,
+  $manage_curl = true,
   $auto_update = true,
   $max_age     = $::php::params::composer_max_age,
   $root_group  = $::php::params::root_group,
@@ -38,7 +42,7 @@
   validate_bool($auto_update)
   validate_re("x${max_age}", '^x\d+$')
 
-  ensure_packages(['curl'])
+  if $manage_curl { ensure_packages(['curl']) }
 
   exec { 'download composer':
     command     => "curl -L ${source} -o ${path}",

manifests/init.pp

@@ -45,6 +45,9 @@
 #   These are passed through to the underlying exec(s), so it follows the same format
 #   of the exec type `environment`
 #
+# [*manage_curl*]
+#   Should we ensure curl is installed or do you want to manage that?
+#
 # [*extensions*]
 #   Install PHP extensions, this is overwritten by hiera hash `php::extensions`
 #
@@ -99,6 +102,7 @@
   $pear_ensure          = $::php::params::pear_ensure,
   $phpunit              = false,
   $environment          = undef,
+  $manage_curl          = true,
   $extensions           = {},
   $settings             = {},
   $package_prefix       = $::php::params::package_prefix,
@@ -120,6 +124,7 @@
   validate_bool($ext_tool_enabled)
   validate_string($pear_ensure)
   validate_bool($phpunit)
+  validate_bool($manage_curl)
   validate_hash($extensions)
   validate_hash($settings)
   validate_string($log_owner)
@@ -196,6 +201,7 @@
     Anchor['php::begin'] ->
       class { '::php::composer':
         environment => $environment,
+        manage_curl => $manage_curl,
       } ->
     Anchor['php::end']
   }