fix old merge issues

Author: Tim Meusel

manifests/master.pp

@@ -23,6 +23,7 @@
 # ['puppet_docroot']            - Doc root to be configured in apache vhost
 # ['puppet_vardir']             - Vardir used by puppet
 # ['puppet_proxy_port']         - Port to configure the proxy on - default 8140
+# ['puppet_conf']               - Path to the puppet main/agent/master config
 # ['puppet_master_package']     - Puppet master package
 # ['puppet_master_service']     - Puppet master service
 # ['version']                   - Version of the puppet master package to install
@@ -41,10 +42,10 @@
 # ['generate_ssl_certs']        - Generate ssl certs (false to disable)
 # ['disable_master']            - this disables the normal master, the server will only act as a CA, currently only supported by nginx
 # ['upstream']                  - define additional masters reachable via tcp as an array, currently only supported by nginx
-# ['backend_process_number']     - number of processes to start on the backebd webserver (unicorn/passenger), currently only supported by unicorn
-#  ['serialization_format']     - defaults to undef, otherwise it sets the preferred_serialization_format param (currently only msgpack is supported)
-#  ['strict_variables']         - Makes the parser raise errors when referencing unknown variables
-#  ['always_cache_features']    - if false (default), always try to load a feature even if a previous load failed
+# ['backend_process_number']    - number of processes to start on the backebd webserver (unicorn/passenger), currently only supported by unicorn
+# ['serialization_format']      - defaults to undef, otherwise it sets the preferred_serialization_format param (currently only msgpack is supported)
+# ['strict_variables']          - Makes the parser raise errors when referencing unknown variables
+# ['always_cache_features']     - if false (default), always try to load a feature even if a previous load failed
 #
 # Requires:
 #
@@ -86,6 +87,7 @@
   $puppet_docroot             = $::puppet::params::puppet_docroot,
   $puppet_vardir              = $::puppet::params::puppet_vardir,
   $puppet_proxy_port          = $::puppet::params::puppet_proxy_port,
+  $puppet_conf                = $::puppet::params::puppet_conf,
   $puppet_passenger_tempdir   = false,
   $puppet_passenger_cfg_addon = '',
   $puppet_master_package      = $::puppet::params::puppet_master_package,
@@ -170,7 +172,7 @@
     default: {
       Anchor['puppet::master::begin'] ->
       class {'puppet::passenger':
-      puppet_proxy_port        => $puppet_passenger_port,
+      puppet_proxy_port        => $puppet_proxy_port,
       puppet_docroot           => $puppet_docroot,
       apache_serveradmin       => $apache_serveradmin,
       puppet_conf              => $::puppet::params::puppet_conf,