add puppet_proxy_port on apache/nginx

this allows us to specify the port where our proxy is listening. defaults to 8140

Author: Tim Meusel

manifests/master.pp

@@ -22,7 +22,7 @@
 #  ['puppet_ssldir']            - Puppet sll directory
 #  ['puppet_docroot']           - Doc root to be configured in apache vhost
 #  ['puppet_vardir']            - Vardir used by puppet
-#  ['puppet_passenger_port']    - Port to configure passenger on default 8140
+#  ['puppet_proxy_port']        - Port to configure the proxy on - default 8140
 #  ['puppet_master_package']    - Puppet master package
 #  ['puppet_master_service']    - Puppet master service
 #  ['version']                  - Version of the puppet master package to install
@@ -74,7 +74,7 @@
   $puppet_ssldir              = $::puppet::params::puppet_ssldir,
   $puppet_docroot             = $::puppet::params::puppet_docroot,
   $puppet_vardir              = $::puppet::params::puppet_vardir,
-  $puppet_passenger_port      = $::puppet::params::puppet_passenger_port,
+  $puppet_proxy_port          = $::puppet::params::puppet_proy_port,
   $puppet_master_package      = $::puppet::params::puppet_master_package,
   $puppet_master_service      = $::puppet::params::puppet_master_service,
   $version                    = 'present',
@@ -126,21 +126,22 @@
     nginx: {
       Anchor['puppet::master::begin'] ->
       class {'puppet::unicorn':
-        listen_address  => $listen_address,
+        listen_address    => $listen_address,
+        puppet_proxy_port => $puppet_proxy_port,
       } ->
       Anchor['puppet::master::end']
     }
     default: {
       Anchor['puppet::master::begin'] ->
       class {'puppet::passenger':
-        puppet_passenger_port  => $puppet_passenger_port,
-        puppet_docroot         => $puppet_docroot,
-        apache_serveradmin     => $apache_serveradmin,
-        puppet_conf            => $::puppet::params::puppet_conf,
-        puppet_ssldir          => $puppet_ssldir,
-        certname               => $certname,
-        conf_dir               => $::puppet::params::confdir,
-        dns_alt_names          => join($dns_alt_names,','),
+        puppet_proxy_port   => $puppet_proxy_port,
+        puppet_docroot      => $puppet_docroot,
+        apache_serveradmin  => $apache_serveradmin,
+        puppet_conf         => $::puppet::params::puppet_conf,
+        puppet_ssldir       => $puppet_ssldir,
+        certname            => $certname,
+        conf_dir            => $::puppet::params::confdir,
+        dns_alt_names       => join($dns_alt_names,','),
       } ->
       Anchor['puppet::master::end']
     }

manifests/params.pp

@@ -23,7 +23,7 @@
   $manifest                         = '/etc/puppet/manifests/site.pp'
   $hiera_config                     = '/etc/puppet/hiera.yaml'
   $puppet_docroot                   = '/etc/puppet/rack/public/'
-  $puppet_passenger_port            = '8140'
+  $puppet_proxy_port                = '8140'
   $puppet_server_port               = '8140'
   $puppet_agent_enabled             = true
   $apache_serveradmin               = 'root'

manifests/passenger.pp

@@ -3,7 +3,7 @@
 # This class installs and configures the puppetdb terminus pacakge
 #
 # Parameters:
-#   ['puppet_passenger_port']    - The port for the virtual host
+#   ['puppet_proxy_port']    - The port for the virtual host
 #   ['puppet_docroot']           - Apache documnet root
 #   ['apache_serveradmin']       - The apache server admin
 #   ['puppet_conf']              - The puppet config dir
@@ -21,17 +21,17 @@
 #
 # Sample Usage:
 #   class { 'puppet::passenger':
-#           puppet_passenger_port  => 8140,
-#           puppet_docroot         => '/etc/puppet/docroot',
-#           apache_serveradmin     => 'wibble',
-#           puppet_conf            => '/etc/puppet/puppet.conf',
-#           puppet_ssldir          => '/var/lib/puppet/ssl',
-#           certname               => 'puppet.example.com',
-#           conf_dir               => '/etc/puppet',
+#           puppet_proxyr_port  => 8140,
+#           puppet_docroot      => '/etc/puppet/docroot',
+#           apache_serveradmin  => 'wibble',
+#           puppet_conf         => '/etc/puppet/puppet.conf',
+#           puppet_ssldir       => '/var/lib/puppet/ssl',
+#           certname            => 'puppet.example.com',
+#           conf_dir            => '/etc/puppet',
 #   }
 #
 class puppet::passenger(
-  $puppet_passenger_port,
+  $puppet_proxy_port,
   $puppet_docroot,
   $apache_serveradmin,
   $puppet_conf,
@@ -99,7 +99,7 @@
   }
 
   apache::vhost { "puppet-${certname}":
-    port              => $puppet_passenger_port,
+    port              => $puppet_proxy_port,
     priority          => '40',
     docroot           => $puppet_docroot,
     serveradmin       => $apache_serveradmin,

manifests/unicorn.pp

@@ -1,7 +1,8 @@
 # Class: puppet::unicorn
 #
 # Parameters:
-# - listen_address - IP for binding the nginx
+#  ['listen_address']     - IP for binding the nginx
+#  ['puppet_proxy_port']  - The port for the virtual host
 #
 # Actions:
 # - Configures nginx and unicorn for puppet master use. Tested only on CentOS 7
@@ -11,14 +12,16 @@
 #
 # Sample Usage:
 #   class {'puppet::unicorn':
-#     listen_address => '10.250.250.1',
+#     listen_address    => '10.250.250.1',
+#     puppet_proxy_port => '8140',
 #   }
 #
 # written by Tim 'bastelfreak' Meusel
 # with big help from Rob 'rnelson0' Nelson
 
 class puppet::unicorn (
   $listen_address,
+  $puppet_proxy_port,
 ){
   include nginx
   # install unicorn

spec/classes/puppet_passenger_spec.rb

@@ -3,7 +3,7 @@
 describe 'puppet::passenger', :type => :class do
       let (:params) do
             {
-                :puppet_passenger_port  => '8140',
+                :puppet_proxy_port  => '8140',
                 :puppet_docroot         => '/etc/puppet/rack/public/',
                 :apache_serveradmin     => 'root',
                 :puppet_conf            => '/etc/puppet/puppet.conf',

spec/classes/puppet_repo_puppetlabs_spec.rb

@@ -10,6 +10,11 @@
         :lsbdistid       => 'Ubuntu'
       }
     end
+    let :params do
+      {
+        :mirror => 'http://apt.puppetlabs.com',
+      }
+    end
     it 'should contain puppetlabs apt repos' do
       should contain_apt__source('puppetlabs').with(
         :repos      => 'main',
@@ -31,6 +36,12 @@
         :operatingsystem => 'Redhat'
       }
     end
+    let :params do
+      {
+        :mirror   => 'http://yum.puppetlabs.com',
+        :priority => '1',
+      }
+    end
     it 'should add the redhat specific repoos' do
       should contain_yumrepo('puppetlabs').with(
         :baseurl  => 'http://yum.puppetlabs.com/el/$releasever/products/$basearch'

templates/puppetmaster

@@ -20,7 +20,7 @@ server {
   proxy_set_header    X-Client-DN     $ssl_client_s_dn;
   proxy_set_header    X-SSL-Subject   $ssl_client_s_dn;
   proxy_set_header    X-SSL-Issuer    $ssl_client_i_dn;
-  listen <%= @listen_address %>:8140 ssl;
+  listen <%= @listen_address %>:<%= @puppet_proxy_port %> ssl;
   root /var/empty;
   location / { 
     proxy_pass http://puppetmaster_unicorn;

tests/passenger.pp

@@ -1,5 +1,5 @@
 class{ 'puppet::passenger':
-  puppet_passenger_port => '8140',
+  puppet_proxy_port => '8140',
   puppet_docroot => '/etc/puppet/doc',
   apache_serveradmin => '[email protected]',
   puppet_site => 'master.example.com',