# This is a combination of 2 commits.

# The first commit's message is:

added manage_webserver param

# The 2nd commit message will be skipped:

#	trying to remove service[http] deps

Author: Tim Meusel

manifests/master.pp

@@ -84,7 +84,12 @@
   $puppetdb_strict_validation = $::puppet::params::puppetdb_strict_validation,
   $dns_alt_names              = ['puppet'],
   $digest_algorithm           = $::puppet::params::digest_algorithm,
+<<<<<<< HEAD
   $webserver                  = 'httpd',
+  $manage_webserver           = false,
+=======
+  $manage_webserver           = undef,
+>>>>>>> trying to remove service[http] deps
 ) inherits puppet::params {
 
   anchor { 'puppet::master::begin': }