Get wwwmaster from settings instead of hardcoded, when possible

diff --git a/pgweb/account/views.py b/pgweb/account/views.py
index ed01e68818a999567c2a1c28b2d797e1c34f24e9..75281b814ac72cedc58ed293ee693bcdde405556 100644 (file)
--- a/pgweb/account/views.py
+++ b/pgweb/account/views.py
@@ -106,7 +106,7 @@ def signup(request):
                                                           form.cleaned_data['email'],
                                                           'Your new postgresql.org community account',
                                                           'account/new_account_email.txt',
-                                                          { 'uid': int_to_base36(user.id), 'token': token, 'user': user}
+                                                          { 'uid': int_to_base36(user.id), 'token': token, 'user': user, 'mastersite': settings.MASTERSITE_ROOT}
                                                           )
 
                        return HttpResponseRedirect('/account/signup/complete/')

diff --git a/templates/account/new_account_email.txt b/templates/account/new_account_email.txt
index fc1ebbfec02bea699b2f4c2ee4ac7b88cf76feec..2ca21165e7fa72e3f4133915d6579c23e890cdf5 100644 (file)
--- a/templates/account/new_account_email.txt
+++ b/templates/account/new_account_email.txt
@@ -3,6 +3,6 @@ PostgreSQL community account.
 
 Please go to the following page and choose a new password:
 
-https://wwwmaster.postgresql.org/account/reset/{{uid}}-{{token}}/
+{{mastersite}}/account/reset/{{uid}}-{{token}}/
 
 Your username, in case you've forgotten, is {{user.username}}.

diff --git a/templates/core/moderation_report.txt b/templates/core/moderation_report.txt
index 44820c83b9506f67567996189e10ee9f1de3527d..6f6de91a2ddcc5792883647e8d87ee6ea2344af8 100644 (file)
--- a/templates/core/moderation_report.txt
+++ b/templates/core/moderation_report.txt
@@ -5,4 +5,4 @@ The following items are currently pending moderation:
 
 Moderators; please check and moderate these items as soon as possible!
 
-https://wwwmaster.postgresql.org/admin/pending/
+{{mastersite}}/admin/pending/

diff --git a/tools/moderation/moderation_report.py b/tools/moderation/moderation_report.py
index 2fbcd59d0b26269667a3908f83c8b1241d40093b..f7adf7dbd7096b85fd4e65a503b80a9aafb758da 100755 (executable)
--- a/tools/moderation/moderation_report.py
+++ b/tools/moderation/moderation_report.py
@@ -21,4 +21,5 @@ if len(counts):
                                           "core/moderation_report.txt",
                                           {
                        'items': counts,
+                       'mastersite': settings.MASTERSITE_ROOT,
                        })