fixed travis-ci build issues

Author: Tim Meusel

manifests/master.pp

@@ -121,7 +121,12 @@
     }
   }
   case $webserver {
-    httpd: {
+    nginx: {
+      Anchor['puppet::master::begin'] ->
+      class {'puppet::unicorn':} ->
+      Anchor['puppet::master::end']
+    }
+    default: {
       Anchor['puppet::master::begin'] ->
       class {'puppet::passenger':
         puppet_passenger_port  => $puppet_passenger_port,
@@ -135,11 +140,7 @@
       } ->
       Anchor['puppet::master::end']
     }
-    nginx: {
-      Anchor['puppet::master::begin'] ->
-      class {'puppet::unicorn':} ->
-      Anchor['puppet::master::end']
-    }
+
   }
   service { $puppet_master_service:
     ensure    => stopped,

manifests/unicorn.pp

@@ -24,7 +24,7 @@
   }
   exec{'systemd-reload':
     command     => '/usr/bin/systemctl daemon-reload',
-    refreshonly => 'true',
+    refreshonly => true,
     notify      => Service['unicorn-puppetmaster'],
   }
   unless defined(Service['unicorn-puppetmaster']) {
@@ -39,8 +39,8 @@
     content => template('puppet/puppetmaster'),
   } ->
   file {'enable-puppetmaster-vhost':
-    path    => '/etc/nginx/sites-enabled/puppetmaster',
     ensure  => 'link',
+    path    => '/etc/nginx/sites-enabled/puppetmaster',
     target  => '/etc/nginx/sites-available/puppetmaster',
     notify  => Service['nginx'],
   }