From 2d21507c63b0a37fbfc36fbbe2d33f85190b61e8 Mon Sep 17 00:00:00 2001 From: bnewbold Date: Wed, 21 Mar 2007 09:40:24 -0700 Subject: FINALLY fixed settings problem cross server By having settings.py.example files the content is pushed and bundled with releases. On dev platform i'll symlink settings.py to these files, on other platforms have seperate settings.py --- bn_django/git_browse/settings.py | 2 - bn_django/git_browse/settings.py.example | 2 + bn_django/git_wiki/settings.py | 14 ----- bn_django/git_wiki/settings.py.example | 17 ++++++ bn_django/settings.py.example | 88 ++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 16 deletions(-) delete mode 100644 bn_django/git_browse/settings.py create mode 100644 bn_django/git_browse/settings.py.example delete mode 100644 bn_django/git_wiki/settings.py create mode 100644 bn_django/git_wiki/settings.py.example create mode 100644 bn_django/settings.py.example diff --git a/bn_django/git_browse/settings.py b/bn_django/git_browse/settings.py deleted file mode 100644 index 87b957d..0000000 --- a/bn_django/git_browse/settings.py +++ /dev/null @@ -1,2 +0,0 @@ -# fill path to the git command -GITCOMMAND = '/usr/local/bin/git' diff --git a/bn_django/git_browse/settings.py.example b/bn_django/git_browse/settings.py.example new file mode 100644 index 0000000..87b957d --- /dev/null +++ b/bn_django/git_browse/settings.py.example @@ -0,0 +1,2 @@ +# fill path to the git command +GITCOMMAND = '/usr/local/bin/git' diff --git a/bn_django/git_wiki/settings.py b/bn_django/git_wiki/settings.py deleted file mode 100644 index 965ac26..0000000 --- a/bn_django/git_wiki/settings.py +++ /dev/null @@ -1,14 +0,0 @@ - -# full path to directory holding the wiki repository (or sys links to -# the repositories) -GITWIKI_BASE = '/home/bnewbold/knowledge/' - -# leave this blank (NO WHITE SPACE) unless you're using a bare repo -GITWIKI_NAME = '' - -# fill path to the git command -GITCOMMAND = '/usr/local/bin/git' - -GITWIKI_DIR = str(GITWIKI_BASE) + '/' + str(GITWIKI_NAME) + '.git' -GITPREFIX = 'cd ' +str(GITWIKI_BASE) + '; ' + str(GITCOMMAND) + ' --git-dir=' \ - + str(GITWIKI_DIR) diff --git a/bn_django/git_wiki/settings.py.example b/bn_django/git_wiki/settings.py.example new file mode 100644 index 0000000..8257277 --- /dev/null +++ b/bn_django/git_wiki/settings.py.example @@ -0,0 +1,17 @@ + +# full path to directory holding the wiki repository (or sys links to +# the repositories) +GITWIKI_BASE = '/home/bnewbold/knowledge/' + +EQU_FOLDER = '/home/bnewbold/bn-project/static/latex2png/' +EQU_PREFIX = '/static/latex2png/' + +# leave this blank (NO WHITE SPACE) unless you're using a bare repo +GITWIKI_NAME = '' + +# fill path to the git command +GITCOMMAND = '/usr/local/bin/git' + +GITWIKI_DIR = str(GITWIKI_BASE) + '/' + str(GITWIKI_NAME) + '.git' +GITPREFIX = 'cd ' +str(GITWIKI_BASE) + '; ' + str(GITCOMMAND) + ' --git-dir=' \ + + str(GITWIKI_DIR) diff --git a/bn_django/settings.py.example b/bn_django/settings.py.example new file mode 100644 index 0000000..d9e3198 --- /dev/null +++ b/bn_django/settings.py.example @@ -0,0 +1,88 @@ +# Django settings for bn_django project. + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + # ('Your Name', 'your_email@domain.com'), + ('Bryan Newbold', 'bnewbold@mit.edu'), +) + +MANAGERS = ADMINS + +DATABASE_ENGINE = 'sqlite3' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. +DATABASE_NAME = '/home/bnewbold/bn-project/bn_django/bn_django.db' # Or path to database file if using sqlite3. +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. + +# Local time zone for this installation. All choices can be found here: +# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE +TIME_ZONE = 'America/Boston' + +# 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 = '/home/bnewbold/bn-project/static/' + +# URL that handles the media served from MEDIA_ROOT. +# Example: "http://media.lawrence.com" +MEDIA_URL = '/static/' + +# 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 = '/static/django-admin/' + +# Make this unique, and don't share it with anybody. +SECRET_KEY = 'jdsgk29845ldsfg0090204tv(GFD8g0(%$)*@$#R%U)#*ifd;/q' + +# 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.contrib.flatpages.middleware.FlatpageFallbackMiddleware', + 'django.contrib.csrf.middleware.CsrfMiddleware', + 'django.middleware.doc.XViewMiddleware', +) + +ROOT_URLCONF = 'bn_django.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. + '/home/bnewbold/bn-project/bn_django/templates', +) + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.admin', + 'django.contrib.flatpages', + 'django.contrib.markup', + 'django.contrib.comments', + 'bn_django.photos', + 'bn_django.git_wiki', + 'bn_django.git_browse', +) -- cgit v1.2.3