From: erickson Date: Wed, 12 Dec 2007 01:47:16 +0000 (+0000) Subject: backporting simple fix to prevent upgrade clobbering X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7f6835733fa6f99ba4e7d37884a567137ce6df7f;p=Evergreen.git backporting simple fix to prevent upgrade clobbering git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2_1@8202 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/admin/ils_admin/settings.py b/Open-ILS/admin/ils_admin/settings.py deleted file mode 100644 index ad556c61cf..0000000000 --- a/Open-ILS/admin/ils_admin/settings.py +++ /dev/null @@ -1,100 +0,0 @@ -# Django settings for ils_admin project. - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -ADMINS = ( - # ('Your Name', 'your_email@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 -) - diff --git a/Open-ILS/admin/ils_admin/settings.py.example b/Open-ILS/admin/ils_admin/settings.py.example new file mode 100644 index 0000000000..ad556c61cf --- /dev/null +++ b/Open-ILS/admin/ils_admin/settings.py.example @@ -0,0 +1,100 @@ +# Django settings for ils_admin project. + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + # ('Your Name', 'your_email@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 +) +