[Pkg-voip-commits] r7112 - in /mumble-django/trunk/debian: apache2.conf patches/00list patches/settings.dpatch

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Sat May  2 18:06:36 2009
New Revision: 7112

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7112
Log:
removed patch to create apache2.conf and created it directly in debian dir

Added:
    mumble-django/trunk/debian/apache2.conf
Modified:
    mumble-django/trunk/debian/patches/00list
    mumble-django/trunk/debian/patches/settings.dpatch

Added: mumble-django/trunk/debian/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/apache2.conf?rev=7112&op=file
==============================================================================
--- mumble-django/trunk/debian/apache2.conf (added)
+++ mumble-django/trunk/debian/apache2.conf Sat May  2 18:06:36 2009
@@ -1,0 +1,11 @@
+Listen 8002
+<VirtualHost *:8002>
+	Alias			/static/	/usr/share/mumble-django/htdocs/
+	Alias			/media/		/usr/share/python-support/python-django/django/contrib/admin/media/
+
+	WSGIScriptAlias         /		/usr/share/mumble-django/mumble-django.wsgi
+	WSGIDaemonProcess       mumble-django threads=25
+	WSGIProcessGroup        mumble-django
+	WSGIScriptReloading     Off
+</VirtualHost>
+

Modified: mumble-django/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/00list?rev=7112&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/00list (original)
+++ mumble-django/trunk/debian/patches/00list Sat May  2 18:06:36 2009
@@ -1,2 +1,1 @@
 settings.dpatch
-apache2_conf.dpatch

Modified: mumble-django/trunk/debian/patches/settings.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/patches/settings.dpatch?rev=7112&op=diff
==============================================================================
--- mumble-django/trunk/debian/patches/settings.dpatch (original)
+++ mumble-django/trunk/debian/patches/settings.dpatch Sat May  2 18:06:36 2009
@@ -5,15 +5,10 @@
 ## DP: Configured paths for the templates and the database file.
 
 @DPATCH@
-diff -urNad mumble-django-0.5~/pyweb/settings.py mumble-django-0.5/pyweb/settings.py
---- mumble-django-0.5~/pyweb/settings.py	2009-04-29 14:23:27.000000000 +0200
-+++ mumble-django-0.5/pyweb/settings.py	2009-04-29 14:34:37.994704608 +0200
-@@ -1,3 +1,4 @@
-+# -*- coding: utf-8 -*-
- # Django settings for mumble_django project.
- 
- #################################################################
-@@ -48,7 +49,7 @@
+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
  
  DATABASE_ENGINE = 'sqlite3'
@@ -22,7 +17,7 @@
  DATABASE_USER = ''
  DATABASE_PASSWORD = ''
  DATABASE_HOST = ''
-@@ -108,6 +109,7 @@
+@@ -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' ),