users: Move account activation handler into the main vhost

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/auth/messages/register.html b/src/templates/auth/messages/register.html
index 75e0429d8afa465a1f905d035a9917cff8d58384..6c983dc7b81193853063553e5917000743cfa177 100644 (file)
--- 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 72e63e5e32cf5227fe42390f299e964dc7f8fdba..9fafa9b227f35b701f03f1c624df0550f214fb8f 100644 (file)
--- 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 9096810e5d42ef7ff331ed55ab6d5085d0a82ac2..b5c82a9072d21e88cb2fe32156e034e27240962f 100644 (file)
--- 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