Merge pull request #230 from tampakrap/unicorn_fixes

improve the rack code in passenger and unicorn

Author: danieldreier

.travis.yml

@@ -3,7 +3,6 @@ language: ruby
 bundler_args: --without development
 before_install: rm Gemfile.lock || true
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.6
 script: bundle exec rake test
@@ -13,10 +12,11 @@ env:
   - PUPPET_VERSION="~> 3.3.0"
   - PUPPET_VERSION="~> 3.4.0"
   - PUPPET_VERSION="~> 3.7.5"
-  - PUPPET_VERSION="~> 3.7.5" FUTURE_PARSER=yes
-  - PUPPET_VERSION="~> 3.7.5" STRINGIFY_FACTS=no
-  - PUPPET_VERSION="~> 3.7.5" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.7.5" ORDERING=random
+  - PUPPET_VERSION="~> 3.8.7"
+  - PUPPET_VERSION="~> 3.8.7" FUTURE_PARSER=yes
+  - PUPPET_VERSION="~> 3.8.7" STRINGIFY_FACTS=no
+  - PUPPET_VERSION="~> 3.8.7" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 3.8.7" ORDERING=random
 matrix:
   exclude:
   - rvm: 2.0.0
@@ -28,4 +28,4 @@ matrix:
   - rvm: 2.1.6
     env: PUPPET_VERSION="~> 3.3.0"
   allow_failures:
-    - env: PUPPET_VERSION="~> 3.7.5" STRICT_VARIABLES=yes
+    - env: PUPPET_VERSION="~> 3.8.7" STRICT_VARIABLES=yes

Gemfile

@@ -2,10 +2,9 @@ source "https://rubygems.org"
 
 group :test do
   gem "rake"
-  gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.5'
+  gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.8.7'
   gem "puppet-lint"
   gem "rspec-puppet"
-  gem "rspec", '< 3.0.0'
   gem "puppet-syntax"
   gem "puppetlabs_spec_helper"
   gem "metadata-json-lint"

files/config.ru.passenger.3

@@ -172,7 +172,7 @@
 
   $service = $servertype ? {
     'passenger'    => 'httpd',
-    'unicorn'      => 'nginx',
+    'unicorn'      => 'unicorn_puppetmaster',
     'standalone'   => $puppet::params::master_service,
   }
 

manifests/server.pp

@@ -9,29 +9,11 @@
   include apache
   include apache::mod::ssl
   include apache::mod::passenger
-
-  file { ['/etc/puppet/rack', '/etc/puppet/rack/public/', '/etc/puppet/rack/tmp']:
-      ensure => directory,
-      owner  => 'puppet',
-      group  => 'puppet',
-  }
-
-  file { '/etc/puppet/rack/config.ru':
-    owner  => 'puppet',
-    group  => 'puppet',
-    mode   => '0644',
-    source => 'puppet:///modules/puppet/config.ru.passenger.3',
-  }
-
-  if $puppet::server::bindaddress == '::' {
-    $ip = '*'
-  } else {
-    $ip = $puppet::server::bindaddress
-  }
+  include puppet::server::rack
 
   apache::vhost { 'puppetmaster':
     servername        => $puppet::server::servername,
-    ip                => $ip,
+    ip                => $puppet::server::bindaddress,
     port              => '8140',
     priority          => '10',
     docroot           => '/etc/puppet/rack/public/',

manifests/server/passenger.pp

@@ -8,19 +8,31 @@
 #
 class puppet::server::rack {
 
+  include puppet
+
+  file { [
+    "${puppet::confdir}/rack",
+    "${puppet::confdir}/rack/public/",
+    "${puppet::confdir}/rack/tmp"
+  ]:
+      ensure => directory,
+      owner  => $puppet::user,
+      group  => $puppet::group,
+  }
+
   # Template variables for concat fragment
-  $puppet_confdir = $::puppet::params::puppet_confdir
-  $puppet_vardir  = $::puppet::params::puppet_vardir
+  $puppet_confdir = $puppet::confdir
+  $puppet_vardir  = $puppet::vardir
 
-  concat { "${puppet_confdir}/config.ru":
+  concat { "${puppet::confdir}/config.ru":
     owner => 'puppet',
     group => 'puppet',
     mode  => '0644',
   }
 
   concat::fragment { 'run-puppet-master':
     order   => '99',
-    target  => "${puppet_confdir}/config.ru",
+    target  => "${puppet::confdir}/config.ru",
     content => template('puppet/config.ru/99-run-3.0.erb'),
   }
 }

manifests/server/rack.pp

@@ -1,6 +1,7 @@
+# Private class
 class puppet::server::unicorn {
 
-  include puppet::params
+  include puppet
   include puppet::server::rack
   include nginx
 
@@ -12,22 +13,22 @@
     ],
   }
 
-  $servername     = pick($::puppet::server::servername, $::clientcert, $::fqdn)
-  $unicorn_socket = "unix:${puppet::params::puppet_rundir}/puppetmaster_unicorn.sock"
+  $unicorn_socket = "unix:${puppet::rundir}/puppetmaster_unicorn.sock"
 
   nginx::resource::vhost { 'puppetmaster':
-    server_name          => [$servername],
+    server_name          => [$puppet::server::servername],
+    listen_ip            => $puppet::server::bindaddress,
     ssl                  => true,
     ssl_port             => '8140',
     listen_port          => '8140', # force ssl_only by matching ssl_port
-    ssl_cert             => "${::puppet::ssldir}/certs/${servername}.pem",
-    ssl_key              => "${::puppet::ssldir}/private_keys/${servername}.pem",
-    ssl_ciphers          => $::puppet::server::ssl_ciphers,
-    ssl_protocols        => $::puppet::server::ssl_protocols,
+    ssl_cert             => "${puppet::ssldir}/certs/${puppet::server::servername}.pem",
+    ssl_key              => "${puppet::ssldir}/private_keys/${puppet::server::servername}.pem",
+    ssl_ciphers          => $puppet::server::ssl_ciphers,
+    ssl_protocols        => $puppet::server::ssl_protocols,
     use_default_location => false,
     vhost_cfg_append     => {
-      ssl_crl                => "${::puppet::ssldir}/crl.pem",
-      ssl_client_certificate => "${::puppet::ssldir}/certs/ca.pem",
+      ssl_crl                => "${puppet::ssldir}/crl.pem",
+      ssl_client_certificate => "${puppet::ssldir}/certs/ca.pem",
       ssl_verify_client      => 'optional',
       proxy_set_header       => [ 'Host $host',
                                   'X-Real-IP $remote_addr',
@@ -67,7 +68,7 @@
       vhost               => 'puppetmaster',
       proxy_set_header    => [],
       location_custom_cfg => {
-        proxy_pass            => $::puppet::server::external_ca,
+        proxy_pass            => $puppet::server::external_ca,
         proxy_redirect        => 'off',
         proxy_connect_timeout => '90',
         proxy_read_timeout    => '300',
@@ -79,13 +80,13 @@
   }
 
   unicorn::app { 'puppetmaster':
-    approot     => $::puppet::params::puppet_confdir,
-    config_file => "${::puppet::params::puppet_confdir}/unicorn.conf",
-    pidfile     => "${::puppet::params::puppet_rundir}/puppetmaster_unicorn.pid",
+    approot     => $puppet::confdir,
+    config_file => "${puppet::confdir}/unicorn.conf",
+    pidfile     => "${puppet::rundir}/puppetmaster_unicorn.pid",
     socket      => $unicorn_socket,
-    logdir      => $::puppet::params::puppet_logdir,
-    user        => 'puppet',
-    group       => 'puppet',
+    logdir      => $puppet::logdir,
+    user        => $puppet::user,
+    group       => $puppet::group,
     before      => Service['nginx'],
 #    export_home => $::confdir, # uncomment pending https://github.com/puppetlabs-operations/puppet-unicorn/pull/14
   }