VladPolskiy/postgres-web
1
0
Fork 0
mirror of https://github.com/postgres/pgweb.git synced 2025-08-10 00:42:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Concept of mastersite is no longer used, remove all references

Browse Source
This commit is contained in:
Magnus Hagander
2011-11-27 12:34:00 +01:00
parent e0dc26457b
commit 84ba10f1ca
6 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/dev_install.rst
View File

@ -24,7 +24,6 @@ with. Here's a quick step-by-step on how to do that:
DEBUG=True DEBUG=True
TEMPLATE_DEBUG=DEBUG TEMPLATE_DEBUG=DEBUG
SUPPRESS_NOTIFICATIONS=True SUPPRESS_NOTIFICATIONS=True
MASTERSITE_ROOT="http://localhost:8000"
SITE_ROOT="http://localhost:8000" SITE_ROOT="http://localhost:8000"
NO_HTTPS_REDIRECT=True NO_HTTPS_REDIRECT=True
#. In the pgweb directory run the following command to create all #. In the pgweb directory run the following command to create all

2
pgweb/account/views.py
View File

@ -125,7 +125,7 @@ def signup(request):
form.cleaned_data['email'], form.cleaned_data['email'],
'Your new postgresql.org community account', 'Your new postgresql.org community account',
'account/new_account_email.txt', 'account/new_account_email.txt',
{ 'uid': int_to_base36(user.id), 'token': token, 'user': user, 'mastersite': settings.MASTERSITE_ROOT} { 'uid': int_to_base36(user.id), 'token': token, 'user': user}
) )
return HttpResponseRedirect('/account/signup/complete/') return HttpResponseRedirect('/account/signup/complete/')

1
pgweb/settings.py
View File

@ -115,7 +115,6 @@ INSTALLED_APPS = [
# In particular, adjust the email addresses # In particular, adjust the email addresses
### ###
SITE_ROOT="http://www.postgresql.org" # Root of working URLs SITE_ROOT="http://www.postgresql.org" # Root of working URLs
MASTERSITE_ROOT="http://wwwmaster.postgresql.org" # Root of working master web
FTP_PICKLE="/usr/local/pgweb/ftpsite.pickle" # Location of file with current contents from ftp site FTP_PICKLE="/usr/local/pgweb/ftpsite.pickle" # Location of file with current contents from ftp site
NOTIFICATION_EMAIL="someone@example.com" # Address to send notifications *to* NOTIFICATION_EMAIL="someone@example.com" # Address to send notifications *to*
NOTIFICATION_FROM="someone@example.com" # Address to send notifications *from* NOTIFICATION_FROM="someone@example.com" # Address to send notifications *from*

2
templates/account/new_account_email.txt
View File

@ -3,6 +3,6 @@ PostgreSQL community account.
Please go to the following page and choose a new password: Please go to the following page and choose a new password:
{{mastersite}}/account/reset/{{uid}}-{{token}}/ https://www.postgresql.org/account/reset/{{uid}}-{{token}}/
Your username, in case you've forgotten, is {{user.username}}. Your username, in case you've forgotten, is {{user.username}}.

2
templates/core/moderation_report.txt
View File

@ -5,4 +5,4 @@ The following items are currently pending moderation:
Moderators; please check and moderate these items as soon as possible! Moderators; please check and moderate these items as soon as possible!
{{mastersite}}/admin/pending/ https://www.postgresql.org/admin/admin/pending/

1
tools/moderation/moderation_report.py
View File

@ -21,5 +21,4 @@ if len(counts):
"core/moderation_report.txt", "core/moderation_report.txt",
{ {
'items': counts, 'items': counts,
'mastersite': settings.MASTERSITE_ROOT,
}) })