From: yomguy <yomguy@parisson.com>
Date: Mon, 16 May 2011 10:03:30 +0000 (+0200)
Subject: update conf examples
X-Git-Tag: 1.1~189
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=950b44d6cbbf8a0cff4abf01cc7d0a630383db6e;p=telemeta.git

update conf examples
---

diff --git a/conf/examples/django/settings.py b/conf/examples/django/settings.py
index ce7ac900..8892a646 100644
--- a/conf/examples/django/settings.py
+++ b/conf/examples/django/settings.py
@@ -14,9 +14,9 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 #        'OPTIONS': { 'init_command': 'SET storage_engine=INNODB', },
-        'NAME': 'telemeta_generic',                      # Or path to database file if using sqlite3.
-        'USER': 'telemeta',                      # Not used with sqlite3.
-        'PASSWORD': 'xxxxxxx',                  # Not used with sqlite3.
+        'NAME': 'crem_gamma',                      # Or path to database file if using sqlite3.
+        'USER': 'root',                      # Not used with sqlite3.
+        'PASSWORD': 'washncellarm',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
@@ -60,10 +60,10 @@ MEDIA_URL = 'http://telemetagen.parisson.com/media/'
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = 'http://localhost/django/media/'
+ADMIN_MEDIA_PREFIX = 'http://wm22.parisson.com/django/media/'
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = 'a8l7%06wr2k+3=%#*#@#hdie2mmzko)4jdloz(zx%lls^ihm9^5'
+SECRET_KEY = 'a8l7%06wr2k+3=%#*#@#rvop2mmzko)44%7k(zx%lls^ihm9^5'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -72,6 +72,8 @@ TEMPLATE_LOADERS = (
 #     'django.template.loaders.eggs.Loader',
 )
 
+#from pybb.settings import *
+
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -79,6 +81,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.locale.LocaleMiddleware',
+#    'pybb.middleware.PybbMiddleware',
 )
 
 ROOT_URLCONF = 'sandbox_generic.urls'
@@ -87,6 +90,7 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
+    '/home/dev/telemeta/sandboxes/sandbox_generic/templates/',
 )
 
 INSTALLED_APPS = (
@@ -98,6 +102,7 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'telemeta',
     'jsonrpc',
+#    'pybb',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -105,11 +110,17 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',
 )
 
+LOCALE_PATHS = (
+    '/home/dev/telemeta/telemeta/telemeta/locale',
+)
+
 
 TELEMETA_ORGANIZATION = 'Parisson'
 TELEMETA_SUBJECTS = ('telemeta', 'tests')
+#TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxTTmRMP7-eYZsBYJ-PvZl_yIepBeRTkyT5vhsplIufBBcU2b3jjLSsn2A'
 TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA'
 TELEMETA_DOWNLOAD_ENABLED = True
+TELEMETA_STREAMING_FORMATS = ('mp3', 'ogg')
 TELEMETA_PUBLIC_ACCESS_PERIOD = 51
 AUTH_PROFILE_MODULE = 'telemeta.userprofile'
 
diff --git a/conf/examples/django/urls.py b/conf/examples/django/urls.py
index 50f7e990..9950059d 100644
--- a/conf/examples/django/urls.py
+++ b/conf/examples/django/urls.py
@@ -26,5 +26,5 @@ urlpatterns = patterns('',
     # Languages
     (r'^i18n/', include('django.conf.urls.i18n')),    
     (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
-
+#    (r'^forum/', include('pybb.urls')),
 )