Merge branch 'concat_update'

.fixtures.yml

@@ -3,7 +3,8 @@ fixtures:
     "puppi":    "git://github.com/example42/puppi.git"
     "monitor":  "git://github.com/example42/puppet-monitor.git"
     "iptables": "git://github.com/example42/puppet-iptables.git"
-    "concat":   "https://github.com/ripienaar/puppet-concat.git"
+    "stdlib":   "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+    "concat":   "git://github.com/puppetlabs/puppetlabs-concat.git"
   symlinks:
     "fail2ban": "#{source_dir}"
 

Modulefile

@@ -6,6 +6,7 @@ project_page 'http://www.netmanagers.com.ar'
 source  'https://github.com/netmanagers/puppet-fail2ban'
 summary 'Puppet module for fail2ban'
 description 'This module installs and manages fail2ban. Check README for details.'
-dependency 'ripienaar/concat', '>=0.2.0'
+dependency 'puppetlabs/stdlib', '>=4.1.0'
-dependency 'example42/puppi', '>= 2.0.0'
+dependency 'puppetlabs/concat', '>=1.0.0'
-dependency 'example42/monitor', '>= 2.0.0'
+dependency 'example42/puppi',   '>=2.0.0'
+dependency 'example42/monitor', '>=2.0.0'

manifests/jail.pp

@@ -37,7 +37,6 @@ define fail2ban::jail (
   $findtime  = '',
   $enable    = true ) {
 
-  include concat::setup
   include fail2ban
 
   $real_jailname = $jailname ? {

spec/defines/fail2ban_jail_spec.rb

@@ -27,7 +27,6 @@ filter   = fail2ban::jail
 "
     end
 
-    it { should include_class('concat::setup') }
     it { should contain_concat__fragment('fail2ban_jail_sample1').with_target('/etc/fail2ban/jail.local').with_content(expected) }
   end
 
@@ -63,7 +62,6 @@ findtime = 9000
 "
     end
 
-    it { should include_class('concat::setup') }
     it { should contain_concat__fragment('fail2ban_jail_sample1').with_target('/etc/fail2ban/jail.local').with_content(expected) }
   end
 end