only define package ressource if we havn't already

rewrite of gcc/ruby-devel installation

add listen_address var for nginx vhost template

implement ip binding for nginx

remove useless variable assignment

Author: Tim Meusel

manifests/master.pp

@@ -32,7 +32,8 @@
 #  ['puppetdb_startup_timeout'] - The timeout for puppetdb
 #  ['dns_alt_names']            - Comma separated list of alternative DNS names
 #  ['digest_algorithm']         - The algorithm to use for file digests.
-#  ['webserver']                - install 'nginx' (with unicorn) or 'httpd' (with passenger)
+#  ['webserver']                - install 'nginx' (with unicorn) or 'httpd' (with passenger) - httpd is default
+#  ['listen_address']           - IP for binding the webserver, defaults to *
 #
 # Requires:
 #
@@ -84,7 +85,8 @@
   $puppetdb_strict_validation = $::puppet::params::puppetdb_strict_validation,
   $dns_alt_names              = ['puppet'],
   $digest_algorithm           = $::puppet::params::digest_algorithm,
-  $webserver                  = 'httpd',
+  $webserver                  = $::puppet::params::default_webserver,
+  $listen_address             = $::puppet::params::listen_address,
 ) inherits puppet::params {
 
   anchor { 'puppet::master::begin': }
@@ -123,7 +125,9 @@
   case $webserver {
     nginx: {
       Anchor['puppet::master::begin'] ->
-      class {'puppet::unicorn':} ->
+      class {'puppet::unicorn':
+        listen_address  => $listen_address,
+      } ->
       Anchor['puppet::master::end']
     }
     default: {

manifests/params.pp

@@ -31,6 +31,8 @@
   $puppetdb_strict_validation       = true
   $environments                     = 'config'
   $digest_algorithm                 = 'md5'
+  $listen_address                   = '*'
+  $default_webserver                = 'httpd'
 
   # Only used when environments == directory
   $environmentpath                  = '$confdir/environments'

manifests/unicorn.pp

@@ -1,7 +1,7 @@
 # Class: puppet::unicorn
 #
 # Parameters:
-# none
+# - listen_address - IP for binding the nginx
 #
 # Actions:
 # - Configures nginx and unicorn for puppet master use. Tested only on CentOS 7
@@ -10,20 +10,30 @@
 # - nginx
 #
 # Sample Usage:
-#   class {'puppet::unicorn':}
+#   class {'puppet::unicorn':
+#     listen_address => '10.250.250.1',
+#   }
 #
 # written by Tim 'bastelfreak' Meusel
 # with big help from Rob 'rnelson0' Nelson
 
-class puppet::unicorn () {
+class puppet::unicorn (
+  $listen_address,
+){
   include nginx
   # install unicorn
-  package {['ruby-devel', 'gcc']:
+  unless defined(Package['ruby-devel']) {
+    package {'ruby-devel':
+      ensure  => 'latest',
+    }
+  }
+  package {'gcc':
     ensure  => 'latest',
   } ->
   package {['unicorn', 'rack']:
     ensure    => 'latest',
     provider  => 'gem',
+    require   => Package['ruby-devel'],
   } ->
   file {'copy-config':
     path    => '/etc/puppet/config.ru',

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 *:8140 ssl;
+  listen <%= @listen_address %>:8140 ssl;
   root /var/empty;
   location / { 
     proxy_pass http://puppetmaster_unicorn;