Merge branch 'feature-nginx' of github.com:bastelfreak/puppetmodule into feature-nginx

Conflicts:
	manifests/unicorn.pp

Author: Gavin Rogers

manifests/master.pp

@@ -36,6 +36,8 @@
 #  ['listen_address']           - IP for binding the webserver, defaults to *
 #  ['disable_ssl']              - Disables SSL on the webserver. usefull if you use this master behind a loadbalancer. currently only supported by nginx, defaults to undef
 #  ['backup_upstream']          - specify another puppet master as fallback. currently only supported by nginx
+#  ['unicorn_package']          - package name of a unicorn rpm. if provided we install it, otherwise we built it via gem/gcc
+#  ['unicorn_path']             - custom path to the unicorn binary
 #
 # Requires:
 #
@@ -91,6 +93,8 @@
   $listen_address             = $::puppet::params::listen_address,
   $disable_ssl                = $::puppet::params::disable_ssl,
   $backup_upstream            = $::puppet::params::backup_upstream,
+  $unicorn_path               = $::puppet::params::unicorn_path,
+  $unicorn_package            = $::puppet::params::unicorn_package,
 ) inherits puppet::params {
 
   anchor { 'puppet::master::begin': }
@@ -134,6 +138,8 @@
         puppet_proxy_port => $puppet_proxy_port,
         disable_ssl       => $disable_ssl,
         backup_upstream   => $backup_upstream,
+        unicorn_package   => $unicorn_package,
+        unicorn_path      => $unicorn_path,
       } ->
       Anchor['puppet::master::end']
     }

manifests/params.pp

@@ -34,7 +34,9 @@
   $listen_address                   = '*'
   $default_webserver                = 'httpd'
   $disable_ssl                      = undef
-  $backup_upstream                  = undef
+  $backup_upstream                  = []
+  $unicorn_package                  = undef
+  $unicorn_path                     = '/usr/local/bin/unicorn'
 
   # Only used when environments == directory
   $environmentpath                  = '$confdir/environments'

manifests/unicorn.pp

@@ -5,6 +5,8 @@
 #  ['puppet_proxy_port']  - The port for the virtual host
 #  ['disable_ssl']        - Disables SSL on the webserver. usefull if you use this master behind a loadbalancer. currently only supported by nginx, defaults to undef
 #  ['backup_upstream']    - specify another puppet master as fallback. currently only supported by nginx
+#  ['unicorn_package']    - package name of a unicorn rpm. if provided we install it, otherwise we built it via gem/gcc
+#  ['unicorn_path']       - custom path to the unicorn binary
 #
 # Actions:
 # - Configures nginx and unicorn for puppet master use. Tested only on CentOS 7
@@ -26,33 +28,44 @@
   $puppet_proxy_port,
   $disable_ssl,
   $backup_upstream,
+  $unicorn_package,
+  $unicorn_path,
 ){
   include nginx
-  # install unicorn
-  unless defined(Package['ruby-devel']) {
-    package {'ruby-devel':
+
+  # if this is provided we install the package from the repo, otherwise we build unicorn from scratch
+  if $unicorn_package {
+    package {$unicorn_package:
       ensure  => 'latest',
     }
+  } else {
+    # install unicorn
+    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'],
+    }
   }
-  package { [ 'policycoreutils-python', 'gcc' ]:
-    ensure  => 'latest',
-  } ->
-  package {['unicorn', 'rack']:
-    ensure    => 'latest',
-    provider  => 'gem',
-    require   => Package['ruby-devel'],
+  file {'unicorn-conf':
+    path    => '/etc/puppet/unicorn.conf',
+    source  => 'puppet:///modules/puppet/unicorn.conf',
   } ->
   file {'copy-config':
     path    => '/etc/puppet/config.ru',
     source  => '/usr/share/puppet/ext/rack/config.ru',
   } ->
-  file {'unicorn-conf':
-    path    => '/etc/puppet/unicorn.conf',
-    source  => 'puppet:///modules/puppet/unicorn.conf',
-  } ->
+
   file {'unicorn-service':
     path    => '/usr/lib/systemd/system/unicorn-puppetmaster.service',
-    source  => 'puppet:///modules/puppet/unicorn-puppetmaster.service',
+    content => template('puppet/unicorn-puppetmaster.service'),
     notify  => Exec['systemd-reload'],
   } ->
   exec{'systemd-reload':
@@ -64,7 +77,6 @@
     service{'unicorn-puppetmaster':
       ensure  => 'running',
       enable  => true,
-      require => Exec['systemd-reload'],
     }
   }
   # update SELinux

files/unicorn-puppetmaster.service renamed to templates/unicorn-puppetmaster.service

@@ -2,7 +2,7 @@
 Description=Puppet master served by Unicorn
 
 [Service]
-ExecStart=/usr/local/bin/unicorn -c /etc/puppet/unicorn.conf
+ExecStart=<%= @unicorn_path %> -c /etc/puppet/unicorn.conf
 ExecReload=/usr/bin/kill -s HUP $MAINPID
 PrivateTmp=yes
 # this would be cool, but then the puppetmaster can't reach the puppetdb