From 42c7cc66fbbdfb5a454a8373652f3e5ce837652e Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 27 Jul 2023 10:37:15 +0000
Subject: [PATCH] users: Move account activation handler into the main vhost

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/auth/messages/register.html | 2 +-
 src/templates/auth/messages/register.txt  | 2 +-
 src/web/__init__.py                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/templates/auth/messages/register.html b/src/templates/auth/messages/register.html
index 75e0429d..6c983dc7 100644
--- a/src/templates/auth/messages/register.html
+++ b/src/templates/auth/messages/register.html
@@ -21,7 +21,7 @@
 						<tbody>
 							<tr>
 								<td>
-                                    <a href="https://people.ipfire.org/activate/{{ uid }}/{{ activation_code }}" target="_blank">{{ _("Activate Account") }}</a>
+                                    <a href="https://www.ipfire.org/activate/{{ uid }}/{{ activation_code }}" target="_blank">{{ _("Activate Account") }}</a>
                                 </td>
 							</tr>
 						</tbody>
diff --git a/src/templates/auth/messages/register.txt b/src/templates/auth/messages/register.txt
index 72e63e5e..9fafa9b2 100644
--- a/src/templates/auth/messages/register.txt
+++ b/src/templates/auth/messages/register.txt
@@ -11,4 +11,4 @@ X-Auto-Response-Suppress: OOF
 
 {{ _("To activate it, please click on this link:") }}
 
-  https://people.ipfire.org/activate/{{ uid }}/{{ activation_code }}
+  https://www.ipfire.org/activate/{{ uid }}/{{ activation_code }}
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 9096810e..b5c82a90 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -123,6 +123,7 @@ class Application(tornado.web.Application):
 			(r"/login", auth.LoginHandler),
 			(r"/logout", auth.LogoutHandler),
 			(r"/register", auth.RegisterHandler),
+			(r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler),
 
 			# Blog
 			(r"/blog", blog.IndexHandler),
@@ -337,7 +338,6 @@ class Application(tornado.web.Application):
 		# people.ipfire.org
 		self.add_handlers(r"people\.([a-z]+\.dev\.)?ipfire\.org", [
 			(r"/", people.IndexHandler),
-			(r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler),
 			(r"/register", auth.RegisterHandler),
 
 			# Serve any static files
-- 
2.47.3