Rename accounts.ipfire.org to people.ipfire.org

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

diff --git a/Makefile.am b/Makefile.am
index 52778bd14fae12226d157e153ec63341d13177af..92326b1ec06c978e970aec34d770734373490c70 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,6 @@ backenddir = $(pythondir)/ipfire
 
 web_PYTHON = \
        src/web/__init__.py \
-       src/web/accounts.py \
        src/web/auth.py \
        src/web/blog.py \
        src/web/download.py \
@@ -87,6 +86,7 @@ web_PYTHON = \
        src/web/handlers_nopaste.py \
        src/web/handlers_talk.py \
        src/web/location.py \
+       src/web/people.py \
        src/web/talk.py \
        src/web/ui_modules.py
 

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 20a3b6dfa6284388ce291b90ee780ea032aefa3b..228810860bcb37b148cf44799aafa624ab53f7a1 100644 (file)
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -335,11 +335,11 @@ class Account(Object):
 
        def avatar_url(self, size=None):
                if self.backend.debug:
-                       hostname = "http://accounts.dev.ipfire.org"
+                       hostname = "http://people.dev.ipfire.org"
                else:
-                       hostname = "https://accounts.ipfire.org"
+                       hostname = "https://people.ipfire.org"
 
-               url = "%s/avatar/%s.jpg" % (hostname, self.uid)
+               url = "%s/users/%s.jpg" % (hostname, self.uid)
 
                if size:
                        url += "?size=%s" % size

diff --git a/src/web/__init__.py b/src/web/__init__.py
index fafccd28e33eab4af611e7a5dbcbc31983ee161d..91fb4eb84cbeaf2d61ffb53419233f731e2ea186 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -11,11 +11,11 @@ import ipfire
 
 from .handlers import *
 
-from . import accounts
 from . import auth
 from . import blog
 from . import download
 from . import location
+from . import people
 from . import talk
 from . import ui_modules
 
@@ -253,9 +253,9 @@ class Application(tornado.web.Application):
                        (r"/profile", TalkProfileHandler),
                ] + authentication_handlers)
 
-               # accounts.ipfire.org
-               self.add_handlers(r"accounts(\.dev)?\.ipfire\.org", [
-                       (r"/avatar/(\w+)\.jpg", accounts.AvatarHandler),
+               # people.ipfire.org
+               self.add_handlers(r"people(\.dev)?\.ipfire\.org", [
+                       (r"/users/(\w+)\.jpg", people.AvatarHandler),
                ])
 
                # ipfire.org

diff --git a/src/web/accounts.py b/src/web/people.py
similarity index 100%
rename from src/web/accounts.py
rename to src/web/people.py