[Pkg-voip-commits] r7551 - in /mumble-django/trunk/debian: apache2.conf mumble-django.postinst patches/01-settings.dpatch

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Tue Sep  1 15:14:35 2009
New Revision: 7551

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7551
Log:
changed to not create a VirtualHost anymore but share the default one

Modified:
    mumble-django/trunk/debian/apache2.conf
    mumble-django/trunk/debian/mumble-django.postinst
    mumble-django/trunk/debian/patches/01-settings.dpatch

Modified: mumble-django/trunk/debian/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/apache2.conf?rev=7551&op=diff
==============================================================================
--- mumble-django/trunk/debian/apache2.conf (original)
+++ mumble-django/trunk/debian/apache2.conf Tue Sep  1 15:14:35 2009
@@ -1,11 +1,7 @@
-Listen 8002
+Alias			/mumble-django/static/	/usr/share/mumble-django/htdocs/
+Alias			/mumble-django/media/	/usr/share/pyshared/django/contrib/admin/media/
 
-<VirtualHost *:8002>
-	Alias			/static/	/usr/share/mumble-django/htdocs/
-	Alias			/media/		/usr/share/pyshared/django/contrib/admin/media/
-
-	WSGIScriptAlias         /		/usr/share/mumble-django/mumble-django.wsgi
-	WSGIDaemonProcess       mumble-django threads=25
-	WSGIProcessGroup        mumble-django
-	WSGIScriptReloading     Off
-</VirtualHost>
+WSGIScriptAlias         /mumble-django		/usr/share/mumble-django/mumble-django.wsgi
+WSGIDaemonProcess       mumble-django threads=25
+WSGIProcessGroup        mumble-django
+WSGIScriptReloading     Off

Modified: mumble-django/trunk/debian/mumble-django.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/mumble-django.postinst?rev=7551&op=diff
==============================================================================
--- mumble-django/trunk/debian/mumble-django.postinst (original)
+++ mumble-django/trunk/debian/mumble-django.postinst Tue Sep  1 15:14:35 2009
@@ -9,20 +9,14 @@
 
 	cd /usr/share/mumble-django/pyweb
 	su www-data -c 'MURMUR_CONNSTR=net.sourceforge.mumble.murmur python manage.py syncdb'
+	./gen_secret_key.sh
+	rm settings.pye
 
 	invoke-rc.d --quiet apache2 reload
 	if [ -x /etc/init.d/munin-node ]; then
 		invoke-rc.d --quiet munin-node restart
 	fi
 
-	echo "******************************************************"
-	echo "***                                                ***"
-	echo "***   Mumble-Django is now running on port 8002.   ***"
-	echo "***   You can login with your superuser at:        ***"
-	echo "***      http://localhost:8002/admin/              ***"
-	echo "***                                                ***"
-	echo "******************************************************"
-
 fi
 
 #DEBHELPER#

Modified: mumble-django/trunk/debian/patches/01-settings.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/01-settings.dpatch?rev=7551&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/01-settings.dpatch (original)
+++ mumble-django/trunk/debian/patches/01-settings.dpatch Tue Sep  1 15:14:35 2009
@@ -4,23 +4,43 @@
 ## DP: Configured paths for the templates and the database file.
 
 @DPATCH@
-diff -urNad mumble-django~/pyweb/settings.py mumble-django/pyweb/settings.py
---- mumble-django~/pyweb/settings.py	2009-05-02 17:54:44.000000000 +0200
-+++ mumble-django/pyweb/settings.py	2009-05-02 17:55:33.589675005 +0200
-@@ -63,7 +63,7 @@
- MANAGERS = ADMINS
- 
+diff -urNad mumble-django-0.10~/pyweb/settings.py mumble-django-0.10/pyweb/settings.py
+--- mumble-django-0.10~/pyweb/settings.py	2009-09-01 12:03:50.000000000 +0200
++++ mumble-django-0.10/pyweb/settings.py	2009-09-01 12:21:17.103010169 +0200
+@@ -20,8 +20,8 @@
+ ##                                                             ##
+ ##  The path inside the VirtualHost that M-D lives in:         ##
+ ##                                                             ##
+-MUMBLE_DJANGO_URL  = '/';                                      ##
+-#MUMBLE_DJANGO_URL  = '/mumble-django/';                       ##
++#MUMBLE_DJANGO_URL  = '/';                                     ##
++MUMBLE_DJANGO_URL  = '/mumble-django/';                        ##
+ ##                                                             ##
+ ##  Make sure you use a trailing slash!                        ##
+ ##                                                             ##
+@@ -33,7 +33,7 @@
+ ##  extracted Mumble-Django.                                   ##
+ ##                                                             ##
+ ##  Default: Auto Detection                                    ##
+-MUMBLE_DJANGO_ROOT = None;                                     ##
++MUMBLE_DJANGO_ROOT = '/usr/share/mumble-django';               ##
+ ##  Examples:                                                  ##
+ #MUMBLE_DJANGO_ROOT = '/srv/mumble-django';                    ##
+ #MUMBLE_DJANGO_ROOT = 'c:/web/mumble-django';                  ##
+@@ -89,7 +89,7 @@
+ # Database settings for Mumble-Django's database. These do NOT need to point to Murmur's database,
+ # Mumble-Django should use its own!
  DATABASE_ENGINE = 'sqlite3'
 -DATABASE_NAME = join( MUMBLE_DJANGO_ROOT, 'mumble-django.db3' )
 +DATABASE_NAME = '/var/lib/mumble-django/mumble-django.db3'
  DATABASE_USER = ''
  DATABASE_PASSWORD = ''
  DATABASE_HOST = ''
-@@ -123,6 +123,7 @@
-     # Always use forward slashes, even on Windows.
-     # Don't forget to use absolute paths, not relative paths.
-     join( MUMBLE_DJANGO_ROOT, 'template' ),
-+    '/usr/share/pyshared-data/python-django-mumble/template',
+@@ -161,6 +161,7 @@
+ 	# Always use forward slashes, even on Windows.
+ 	# Don't forget to use absolute paths, not relative paths.
+ 	join( MUMBLE_DJANGO_ROOT, 'template' ),
++	'/usr/share/pyshared-data/python-django-mumble/template',
  )
  
  INSTALLED_APPS = (