commit 906a2ed4b4cb56adf4c785413d00dc0fa6279a58 Author: Sherief Alaa <sheriefalaa.w@gmail.com> Date: Wed May 14 03:24:10 2014 +0200 added a new config element (url) --- pups/settings.py.sample | 33 ++++++--------------------------- webchat/views.py | 2 +- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/pups/settings.py.sample b/pups/settings.py.sample index e682730..8f35996 100644 --- a/pups/settings.py.sample +++ b/pups/settings.py.sample @@ -1,31 +1,9 @@ -# This file is part of Pups, a django/python project which contains -# web support tools -# -# Author: Sherief Alaa <sheriefalaa.w@gmail.com> -# -# Copyright: -# (c) 2014 Sherief Alaa. -# (c) 2014 The Tor Project, Inc. -# -# Pups is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Pups is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Pups. If not, see <http://www.gnu.org/licenses/>. - # Django settings for pups project. import os PROJECT_PATH = os.path.dirname(os.path.realpath(__file__)) -#DEBUG = True -DEBUG = False +DEBUG = True +#DEBUG = False TEMPLATE_DEBUG = DEBUG ADMINS = ( @@ -135,8 +113,9 @@ TEMPLATE_CONTEXT_PROCESSORS = ( # pups custom configuration CONFIG = { - 'server': 'localhost:8000', # IP or domain name - 'bosh': 'http://188.226.179.216/http-bind', # http://example.com/http-bind - 'receiver': '@localhost', # @example.lit + 'url': 'support.example.com' # URL that will be displayed in /token + 'server': '', # xmpp server + 'bosh': '', # http://example.com/http-bind + 'receiver': '', # @example.lit 'expiration_days': 3 # Token expiration days } diff --git a/webchat/views.py b/webchat/views.py index 1d5e87a..aec8135 100644 --- a/webchat/views.py +++ b/webchat/views.py @@ -46,7 +46,7 @@ def tokens_page(request): 'name': request.user.username, 'tokens': token.get_assistant_tokens( User.objects.get(id=request.user.id)), - 'server': settings.CONFIG['server'] + 'url': settings.CONFIG['url'] } # View all tokens owned by logged in assistant return render(request, 'tokens.html', params)