From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Oct 2018 09:01:20 +0000 (+0100)
Subject: Rename accounts.ipfire.org to people.ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03706893dce6b2061d1792591462027554032450;p=ipfire.org.git

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 52778bd1..92326b1e 100644
--- 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 20a3b6df..22881086 100644
--- 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 fafccd28..91fb4eb8 100644
--- 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