Merge branch 'master' of https://github.com/example42/puppet-nginx

Author: alvagante

.fixtures.yml

@@ -4,7 +4,7 @@ fixtures:
     "monitor": "git://github.com/example42/puppet-monitor.git"
     "firewall": "git://github.com/example42/puppet-firewall.git"
     "iptables": "git://github.com/example42/puppet-iptables.git"
-    "concat": "git://github.com/example42/puppet-concat.git"
+    "concat":   "https://github.com/puppetlabs/puppet-concat.git"
   symlinks:
     "nginx": "#{source_dir}"
 

Modulefile

@@ -8,6 +8,6 @@ source 'https://github.com/example42/puppet-nginx'
 summary 'Puppet module for nginx'
 description 'This module installs and manages nginx. Check README.rdoc for details. Puppi is required for some common functions: you can install them without using the whole module. Monitor and firewall dependencies are needed only if the relevant features are enabled'
 dependency 'example42/puppi', '>=2.0.0'
-dependency 'ripienaar/concat', '>=0.0.1'
+dependency 'puppetlabs/concat', '>=1.0.0'
 dependency 'example42/firewall', '>=2.0.0'
 dependency 'example42/monitor', '>=2.0.0'

manifests/resource/location.pp

@@ -77,7 +77,7 @@
     default  => file,
   }
 
-  $file_real = "${nginx::config_dir}/${nginx::vdir}/${vhost}.conf"
+  $file_real = "${nginx::vdir}/${vhost}.conf"
 
   # Use proxy template if $proxy is defined, otherwise use directory template.
   if ($proxy != undef) {

manifests/resource/upstream.pp

@@ -35,7 +35,7 @@
     default  => file,
   }
 
-  file { "${nginx::config_dir}/${nginx::cdir}/${name}-upstream.conf":
+  file { "${nginx::cdir}/${name}-upstream.conf":
     ensure   => $real_file,
     content  => template($template_upstream),
     notify   => $nginx::manage_service_autorestart,

manifests/resource/vhost.pp

@@ -79,7 +79,6 @@
 
   include nginx
   include nginx::params
-  include concat::setup
 
   $bool_ssl_only = any2bool($ssl_only)
 
@@ -93,7 +92,7 @@
     default => $groupowner,
   }
 
-  $file_real = "${nginx::config_dir}/${nginx::vdir}/${name}.conf"
+  $file_real = "${nginx::vdir}/${name}.conf"
 
   # Some OS specific settings:
   # On Debian/Ubuntu manages sites-enabled

spec/classes/nginx_spec.rb

@@ -4,7 +4,7 @@
 
   let(:title) { 'nginx' }
   let(:node) { 'rspec.example42.com' }
-  let(:facts) { { :ipaddress => '10.42.42.42' } }
+  let(:facts) { { :ipaddress => '10.42.42.42', :concat_basedir => '/var/lib/puppet/concat' } }
 
   describe 'Test standard installation' do
     it { should contain_package('nginx').with_ensure('present') }