--- a/manifests/templates.pp	Sun Oct 18 19:39:46 2015 +0100
+++ b/manifests/templates.pp	Sun Oct 25 20:17:52 2015 +0000
@@ -202,6 +202,9 @@
 	file { '/etc/logwatch/scripts/shared/':
 		ensure => directory,
 	}
+	file { '/etc/logwatch/scripts/services/fail2ban':
+		source => 'puppet:///common/logwatch/services-fail2ban',
+	}
 	file { '/etc/logwatch/scripts/services/http-error':
 		source => 'puppet:///common/logwatch/http-error',
 	}
@@ -261,6 +264,9 @@
 		require => Package['fail2ban'],
 		notify => Service['fail2ban'],
 	}
+	file { '/etc/fail2ban/fail2ban.local':
+		source => 'puppet:///common/fail2ban/fail2ban.local',
+	}
 	file { '/etc/fail2ban/jail.local':
 		source => 'puppet:///common/fail2ban/jail.local',
 	}
@@ -296,10 +302,6 @@
 	file { '/etc/fail2ban/filter.d/ibb-postfix.conf':
 		source => 'puppet:///common/fail2ban/ibb-postfix.conf',
 	}
-	file { '/etc/fail2ban/fail2ban.local':
-		content => '[Definition]
-logtarget = /var/log/fail2ban.log'
-	}
 	# Because one of our rules checks fail2ban's log, but the service dies without the file
 	file { '/var/log/fail2ban.log':
 		ensure => present,
@@ -328,6 +330,7 @@
 	class { 'website::php':
 		suffix => '55ibb', #IBBoard's rebuild of Webtatic's PHP 5.5
 		opcache => 'opcache',
+		extras => [ 'process' ],
 	}
 
 	#Setup MySQL, using (private) templates to make sure that we set non-std passwords and a default user
@@ -449,7 +452,7 @@
 		custom_fragment => template("private/apache/hwt.fragment"),
 	}
 	website::https::multitld { 'forums.hiveworldterra': 
-		custom_fragment => 'ErrorDocument 404 /error.php'
+		custom_fragment => template("private/apache/forums.fragment"),
 	}
 	website::https::multitld { 'skins.hiveworldterra':
 		custom_fragment => template("private/apache/skins.fragment"),