# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1681926253 -3600
# Node ID 377fbb08568a0010733db57037b71de783e2548e
# Parent  a4cf3d8f20729d1dd85a0bcb78b740613f9c0324
Switch WarFoundry to redirect before domains expire

diff -r a4cf3d8f2072 -r 377fbb08568a manifests/templates.pp
--- a/manifests/templates.pp	Sat Mar 11 17:27:23 2023 +0000
+++ b/manifests/templates.pp	Wed Apr 19 18:44:13 2023 +0100
@@ -703,10 +703,25 @@
 	ErrorDocument 404 /error.php",
 		letsencrypt_name => 'abiknight.co.uk',
 	}
-	website::https::multitld { 'www.warfoundry':
+	website::https::redir { 'www.warfoundry.co.uk':
+		proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:07", default => undef },
+		redir => 'https://www.ibboard.co.uk/warfoundry/',
+		letsencrypt_name => 'warfoundry.co.uk',
+	}
+	website::https::redir { 'warfoundry.co.uk':
 		proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:07", default => undef },
+		redir => 'https://www.ibboard.co.uk/warfoundry/',
 		letsencrypt_name => 'warfoundry.co.uk',
-		custom_fragment => template("privat/apache/warfoundry.fragment"),
+	}
+	website::https::redir { 'www.warfoundry.com':
+		proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:07", default => undef },
+		redir => 'https://www.ibboard.co.uk/warfoundry/',
+		letsencrypt_name => 'warfoundry.co.uk',
+	}
+	website::https::redir { 'warfoundry.com':
+		proxy_4to6_ip => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:07", default => undef },
+		redir => 'https://www.ibboard.co.uk/warfoundry/',
+		letsencrypt_name => 'warfoundry.co.uk',
 	}
 	class { "webmailpimsite":
 		proxy_4to6_ip_pim => $proxy_4to6_ip_prefix != undef ? { true => "$proxy_4to6_ip_prefix:08", default => undef },