Mercurial > repos > other > Puppet

changeset 435:377fbb08568a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch WarFoundry to redirect before domains expire
author IBBoard <dev@ibboard.co.uk>
date Wed, 19 Apr 2023 18:44:13 +0100
parents a4cf3d8f2072
children 6293839019d0
files manifests/templates.pp
diffstat 1 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 },