[open-ils-commits] r8201 - branches/rel_1_2/Open-ILS/admin/ils_admin

svn at svn.open-ils.org svn at svn.open-ils.org
Tue Dec 11 21:01:03 EST 2007


Author: erickson
Date: 2007-12-11 20:40:30 -0500 (Tue, 11 Dec 2007)
New Revision: 8201

Added:
   branches/rel_1_2/Open-ILS/admin/ils_admin/settings.py.example
Removed:
   branches/rel_1_2/Open-ILS/admin/ils_admin/settings.py
Log:
moving to .example to prevent upgrade clobbering

Deleted: branches/rel_1_2/Open-ILS/admin/ils_admin/settings.py
===================================================================
--- branches/rel_1_2/Open-ILS/admin/ils_admin/settings.py	2007-12-11 18:34:21 UTC (rev 8200)
+++ branches/rel_1_2/Open-ILS/admin/ils_admin/settings.py	2007-12-12 01:40:30 UTC (rev 8201)
@@ -1,100 +0,0 @@
-# Django settings for ils_admin project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', 'your_email at domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'sqlite3'           # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = '/openils/var/data/django.db'             # Or path to database file if using sqlite3.
-DATABASE_SCHEMAS = ''
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
-"""
-2007-03-28: the "django" user in the primary ILS database needs to have
-the following schemas set in the default search path: actor, permission, public, config
-"""
-
-OTHER_DATABASES = { 
-    'ils_data': { 
-        'DATABASE_ENGINE' : 'postgresql_psycopg2',
-        'DATABASE_NAME' : 'evergreen',
-        'DATABASE_HOST' : '127.0.0.1',
-        'DATABASE_PORT' : '5432',
-        'DATABASE_USER' : 'django',
-        'DATABASE_PASSWORD' : '',
-        'MODELS': ['ils_data']
-    },
-}
-
-# Local time zone for this installation. All choices can be found here:
-# http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
-TIME_ZONE = 'America/New_York'
-
-# Language code for this installation. All choices can be found here:
-# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
-# http://blogs.law.harvard.edu/tech/stories/storyReader$15
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-MEDIA_URL = ''
-
-# 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 = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'rpbefxd0ahnu0pz1hyw6fo$_fj%%op!d9*7bqh0dw=&-^dz8%z'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
-)
-
-ROOT_URLCONF = 'ils_admin.urls'
-
-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.
-	 '/openils/var/admin/ils_admin/templates/default'
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'ils_admin.setup',
-    'ils_admin.setup.ils_data', # load the ILS models
-)
-

Copied: branches/rel_1_2/Open-ILS/admin/ils_admin/settings.py.example (from rev 8200, branches/rel_1_2/Open-ILS/admin/ils_admin/settings.py)
===================================================================
--- branches/rel_1_2/Open-ILS/admin/ils_admin/settings.py.example	                        (rev 0)
+++ branches/rel_1_2/Open-ILS/admin/ils_admin/settings.py.example	2007-12-12 01:40:30 UTC (rev 8201)
@@ -0,0 +1,100 @@
+# Django settings for ils_admin project.
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+    # ('Your Name', 'your_email at domain.com'),
+)
+
+MANAGERS = ADMINS
+
+DATABASE_ENGINE = 'sqlite3'           # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
+DATABASE_NAME = '/openils/var/data/django.db'             # Or path to database file if using sqlite3.
+DATABASE_SCHEMAS = ''
+DATABASE_USER = ''             # Not used with sqlite3.
+DATABASE_PASSWORD = ''         # Not used with sqlite3.
+DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+
+"""
+2007-03-28: the "django" user in the primary ILS database needs to have
+the following schemas set in the default search path: actor, permission, public, config
+"""
+
+OTHER_DATABASES = { 
+    'ils_data': { 
+        'DATABASE_ENGINE' : 'postgresql_psycopg2',
+        'DATABASE_NAME' : 'evergreen',
+        'DATABASE_HOST' : '127.0.0.1',
+        'DATABASE_PORT' : '5432',
+        'DATABASE_USER' : 'django',
+        'DATABASE_PASSWORD' : '',
+        'MODELS': ['ils_data']
+    },
+}
+
+# Local time zone for this installation. All choices can be found here:
+# http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
+TIME_ZONE = 'America/New_York'
+
+# Language code for this installation. All choices can be found here:
+# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
+# http://blogs.law.harvard.edu/tech/stories/storyReader$15
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = ''
+
+# URL that handles the media served from MEDIA_ROOT.
+# Example: "http://media.lawrence.com"
+MEDIA_URL = ''
+
+# 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 = '/media/'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = 'rpbefxd0ahnu0pz1hyw6fo$_fj%%op!d9*7bqh0dw=&-^dz8%z'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.load_template_source',
+    'django.template.loaders.app_directories.load_template_source',
+#     'django.template.loaders.eggs.load_template_source',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.middleware.doc.XViewMiddleware',
+)
+
+ROOT_URLCONF = 'ils_admin.urls'
+
+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.
+	 '/openils/var/admin/ils_admin/templates/default'
+)
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.admin',
+    'ils_admin.setup',
+    'ils_admin.setup.ils_data', # load the ILS models
+)
+



More information about the open-ils-commits mailing list