# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1437929743 -3600
# Node ID 3674aac72674857daa991774ac0150d32788f30a
# Parent  2c1e222300f69225462cb808d6ed807987a9b06b# Parent  546dfa011f5856962228e31a7bfd2e109a360782
Merge Default changes to Puppet 3.6 and fix conflict

diff -r 2c1e222300f6 -r 3674aac72674 common/fail2ban/ibb-repeat-offender.conf
--- a/common/fail2ban/ibb-repeat-offender.conf	Sun Jul 26 17:50:51 2015 +0100
+++ b/common/fail2ban/ibb-repeat-offender.conf	Sun Jul 26 17:55:43 2015 +0100
@@ -16,7 +16,8 @@
 #          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
 # Values: TEXT
 #
-failregex = fail2ban.actions:\s+WARNING\s+\[(?:.*)\]\s+Ban\s+<HOST>
+failregex = WARNING\s+\[(?:.*)\]\s+Ban\s+<HOST>
+            INFO\s+\[(?:.*)\]\s+<HOST> already banned
 
 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.
diff -r 2c1e222300f6 -r 3674aac72674 manifests/templates.pp
--- a/manifests/templates.pp	Sun Jul 26 17:50:51 2015 +0100
+++ b/manifests/templates.pp	Sun Jul 26 17:55:43 2015 +0100
@@ -39,7 +39,7 @@
 	#VPS is a self-mastered Puppet machine, so bodge a Hosts file
 	file { '/etc/hosts':
 		ensure => present,
-		content => "127.0.0.1   localhost puppet
+		content => "127.0.0.1   localhost
 $primary_ip ${fqdn}",
 	}
 
diff -r 2c1e222300f6 -r 3674aac72674 modules/website/manifests/init.pp
--- a/modules/website/manifests/init.pp	Sun Jul 26 17:50:51 2015 +0100
+++ b/modules/website/manifests/init.pp	Sun Jul 26 17:55:43 2015 +0100
@@ -37,6 +37,7 @@
   apache::mod {
     'rewrite':;
     'expires':; 'setenvif':; 'headers':;
+    'version':;
   }
   file { $base_dir:
     ensure => directory;