diff options
| -rw-r--r-- | bn_django/git_wiki/settings.py | 10 | ||||
| -rw-r--r-- | bn_django/settings.py | 14 |
2 files changed, 13 insertions, 11 deletions
diff --git a/bn_django/git_wiki/settings.py b/bn_django/git_wiki/settings.py index 882dd30..ed07f53 100644 --- a/bn_django/git_wiki/settings.py +++ b/bn_django/git_wiki/settings.py @@ -1,13 +1,13 @@ # full path to directory holding the wiki repository (or sys links to # the repositories) -GITWIKI_BASE = '/srv/git/knowledge.git' +GITWIKI_BASE = '/home/bnewbold/knowledge/' # leave this blank (NO WHITE SPACE) unless you're using a bare repo -GITWIKI_NAME = 'knowledge' +GITWIKI_NAME = '' # fill path to the git command -GITCOMMAND = '/usr/bin/git' +GITCOMMAND = '/usr/local/bin/git' -GITPREFIX = 'cd ' +str(GITWIKI_BASE) + '/.. ; ' + str(GITCOMMAND) + ' --git-dir=' \ - + str(GITWIKI_BASE) +GITPREFIX = 'cd ' +str(GITWIKI_BASE) + '; ' + str(GITCOMMAND) + ' --git-dir=' \ + + str(GITWIKI_BASE) + '/' + GITWIKI_NAME + '.git' diff --git a/bn_django/settings.py b/bn_django/settings.py index d04cbe7..8041cc1 100644 --- a/bn_django/settings.py +++ b/bn_django/settings.py @@ -11,7 +11,7 @@ ADMINS = ( MANAGERS = ADMINS DATABASE_ENGINE = 'sqlite3' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. -DATABASE_NAME = '/srv/django/bn_django.db' # Or path to database file if using sqlite3. +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. @@ -19,7 +19,7 @@ DATABASE_PORT = '' # Set to empty string for default. Not used with # 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/Seattle' +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 @@ -34,16 +34,16 @@ USE_I18N = True # Absolute path to the directory that holds media. # Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = '/srv/http/bryannewbold/static/' +MEDIA_ROOT = '/home/bnewbold/bn-project/media/' # URL that handles the media served from MEDIA_ROOT. # Example: "http://media.lawrence.com" -MEDIA_URL = 'http://static.bryannewbold.com/' +MEDIA_URL = '/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://static.bryannewbold.com/django-admin/' +ADMIN_MEDIA_PREFIX = '/style/django-admin/' # Make this unique, and don't share it with anybody. SECRET_KEY = 'jdsgk29845ldsfg0090204tv(GFD8g0(%$)*@$#R%U)#*ifd;/q' @@ -70,7 +70,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. - '/srv/django/bn-project/bn_django/templates', + '/home/bnewbold/bn-project/bn_django/templates', ) INSTALLED_APPS = ( @@ -86,3 +86,5 @@ INSTALLED_APPS = ( 'bn_django.git_wiki', 'bn_django.git_browse', ) + +GITBROWSE_BASE = '/home/bnewbold/bn-project/code' |