diff --git a/AUTHORS b/AUTHORS index 568312d..734c050 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,7 +1,7 @@ The primary author of mumble-django is Michael "Svedrin" Ziegler . -The Dbus/ICE interface modules are developed by withgod +The Dbus/ICE interface modules have been contributed by withgod . Others who have contributed to the application: diff --git a/CHANGELOG b/CHANGELOG index 5239fda..7afdfa7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,24 @@ Mumble-Django changelog ======================= +Version 0.8, 11 July 2009: +------------------------------ +* Added Ice connector objects. Now MD can connect via both DBus and Ice. +* Connectors can be used simultaneously, so managing 1.1.8 and 1.2.0 Murmurs + is possible with a single instance of Mumble-Django. +* Full compatibility to Murmur 1.2.0. +* Added Channel descriptions to channel viewer for 1.2.0 servers. +* management.py can now *always* add servers with a non-default connstring, + not only when the default connstring doesn't resolve. +* management.py tries to get connstring from an environment variable. +* Changed channel viewer to use
s instead of a table, which is a lot + cleaner to generate. +* Fixed username@ missing in the channel links. +* Merged mmServer object directly into Model and cleaned up mmobjects.py. +* Added "Default connstring" and "Slice Version" fields to settings.py. +* Added a Munin plugin to display the number of players on each server. +* Added a few UNIQUE statements to the Models to prevent get() errors. + Version 0.7, 27 May 2009: ------------------------------ * Added copyright information about the Icons in the channel viewer to diff --git a/COPYRIGHT b/COPYRIGHT index e75e57c..1b1a281 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -26,7 +26,8 @@ License: =============================================================================== -The directory "htdocs/ext-2.2" provides the ExtJS JavaScript library. +The directory "htdocs/ext-2.2" provides the ExtJS JavaScript library, +version 2.2. Ext JS - JavaScript Library Copyright © 2006-2008, Ext JS, LLC diff --git a/INSTALL b/INSTALL index be4dfb7..5b0882b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,16 +1,21 @@ -Thanks for downloading mumble-django. +Thank you for downloading mumble-django. :-) To install mumble-django, extract it to wherever you would like it to reside, and then run: python manage.py syncdb -Under most circumstances, that should be all you need to do. However, if -Murmur is not configured to connect to DBus, syncdb will give you an error -message and Mumble-Django will not be able to work correctly. In this case, -have a look at the wiki at - -for instructions how to connect Murmur to DBus. +This script will create the database for you. You will be asked whether to +use Ice or DBus to connect to Murmur, so please make sure that: +a) Murmur is reachable either over Ice or DBus. How to configure that is + described in the wiki at + http://bitbucket.org/Svedrin/mumble-django/wiki/Connecting_Murmur_to_ICE + and + http://bitbucket.org/Svedrin/mumble-django/wiki/Connecting_Murmur_to_DBus +b) the slice version configured in settings.py matches the Murmur version + you are running (1.1.8 or 1.2.0). +In case of an emergency, you can always skip this step and repeat it later +simply by running the syncdb command again. If you need instructions on how to configure your web server in order to serve this application, you can have a look at the Wiki at @@ -20,13 +25,24 @@ shouldn't need to edit it. Django_Registration requires a valid EMail address to be set in settings.py, that can be used as a sender address for the registration emails. If you -intend to use the registration feature, you may need to change the +intend to use the registration feature, you will need to change the DEFAULT_FROM_EMAIL setting in settings.py. -Note that there is no need to use the same Database that Murmur itself uses, -as mumble-django exclusively uses DBus to connect to Murmur and does not +Note that there it is discouraged to use the same Database that Murmur itself +uses, as mumble-django exclusively uses DBus to connect to Murmur and does not access Murmur's database directly. Also note that this application requires Python 2.3 or later, and a functional installation of Django 1.0 or newer. You can obtain Python from http://www.python.org/ and Django from http://www.djangoproject.com/. + +In order to use the Munin plugin that ships with Mumble-Django, just symlink +munin.py to /etc/munin/plugins and restart munin-node. Munin will then create +a new section called "Mumble users" in the Network category. Don't worry if +the numbers show up as "nan" at first, this will go away after a few Munin +runs. To test the plugin, simply run it: + standalone: python munin.py + via Munin: munin-run +It should give you an output like "1.value 10". If it doesn't, you might need +to set the MUMBLE_DJANGO_ROOT variable to the path you extracted Mumble-Django +to (i.e, the one mumble-django.wsgi can be found in). diff --git a/munin.py b/munin.py index 622bbbc..74bea4a 100755 --- a/munin.py +++ b/munin.py @@ -1,5 +1,19 @@ #!/usr/bin/python +""" + * Copyright (C) 2009, Michael "Svedrin" Ziegler + * + * Mumble-Django 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 2 of the License, or + * (at your option) any later version. + * + * This package 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. +""" + # Set this to the same path you used in settings.py, or None for auto-detection. MUMBLE_DJANGO_ROOT = None; diff --git a/pyweb/update-v0.5-v0.6.sh b/pyweb/update-v0.5-v0.6.sh deleted file mode 100755 index a9a7255..0000000 --- a/pyweb/update-v0.5-v0.6.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2009, Michael "Svedrin" Ziegler -# -# Mumble-Django 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 2 of the License, or -# (at your option) any later version. -# -# This package 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. -# -# I know this script sucks ass, thank you very much - but it should do the -# trick. It creates the columns in the database that have been added in v0.6. -# - -</dev/null -# -*- coding: utf-8 -*- -from django.db import connection -from django.conf import settings -crs = connection.cursor(); - -crs.execute( "ALTER TABLE mumble_mumble ADD obfsc BOOLEAN NOT NULL DEFAULT 0" ); -crs.execute( "ALTER TABLE mumble_mumble ADD player VARCHAR(200) NOT NULL DEFAULT '%s'" % r'[-=\\w\\[\\]\\{\\}\\(\\)\\@\\|\\.]+' ); -crs.execute( "ALTER TABLE mumble_mumble ADD channel VARCHAR(200) NOT NULL DEFAULT '%s'" % r'[ \\-=\\w\\#\\[\\]\\{\\}\\(\\)\\@\\|]+' ); -crs.execute( "ALTER TABLE mumble_mumble ADD defchan INTEGER NOT NULL DEFAULT 0" ); -EOF