Merge branch 'production' of animus:/srv/django/bn-project/ into comments

6 files changed, 26 insertions, 28 deletions

diff --git a/bn_django/git_browse/templates/git_browse/base.html b/bn_django/git_browse/templates/git_browse/base.html
index 89a0139..4e44ac2 100644
--- a/bn_django/git_browse/templates/git_browse/base.html
+++ b/bn_django/git_browse/templates/git_browse/base.html
@@ -2,9 +2,9 @@
 
 {% block stylesheets %}
 {{ block.super }}
-<link rel="STYLESHEET" type="text/css" href="style/git_browse.css" />
-<link rel="STYLESHEET" type="text/css" href="/style/git_browse.css" />
-<!--<link rel="STYLESHEET" type="text/css" href="http://static.bryannewbold.com/style/git_browse.css" />-->
+<!--<link rel="STYLESHEET" type="text/css" href="style/git_browse.css" />
+<link rel="STYLESHEET" type="text/css" href="/style/git_browse.css" />-->
+<link rel="STYLESHEET" type="text/css" href="http://static.bryannewbold.com/style/git_browse.css" />
 
 {% endblock %}
 
diff --git a/bn_django/git_wiki/models.py b/bn_django/git_wiki/models.py
index 11f00f1..ae9ef79 100644
--- a/bn_django/git_wiki/models.py
+++ b/bn_django/git_wiki/models.py
@@ -150,10 +150,10 @@ def fromslug(reqslug):
     import commands
     
     if reqslug == '' or reqslug == '/':
-        f = open(GITWIKI_BASE + '/.git/HEAD','r')
+        f = open(GITWIKI_BASE + '/HEAD','r')
         head = f.readline().strip().split()[1]
         f.close()
-        f = open(GITWIKI_BASE + '/.git/'+head,'r')
+        f = open(GITWIKI_BASE + '/'+head,'r')
         hash = f.readline().strip()
         f.close()
         ret = Tree(id=hash)
@@ -198,13 +198,13 @@ def fromslug(reqslug):
 def reposcan():
     import os
     heads = dict()
-    for h in os.listdir(GITWIKI_BASE + '/.git/refs/heads/'):
-        f = open(GITWIKI_BASE + '/.git/refs/heads/' + h,'r')
+    for h in os.listdir(GITWIKI_BASE + '/refs/heads/'):
+        f = open(GITWIKI_BASE + '/refs/heads/' + h,'r')
         heads[h.strip()] = f.readline().strip()
         f.close()
     tags = dict()
-    for t in os.listdir(GITWIKI_BASE + '/.git/refs/tags/'):
-        f = open(GITWIKI_BASE + '/.git/refs/tags/' + t,'r')
+    for t in os.listdir(GITWIKI_BASE + '/refs/tags/'):
+        f = open(GITWIKI_BASE + '/refs/tags/' + t,'r')
         tags[t.strip()] = f.readline().strip()
         f.close()
     return (heads, tags)
diff --git a/bn_django/git_wiki/settings.py b/bn_django/git_wiki/settings.py
index ed07f53..882dd30 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 = '/home/bnewbold/knowledge/'
+GITWIKI_BASE = '/srv/git/knowledge.git'
 
 # leave this blank (NO WHITE SPACE) unless you're using a bare repo
-GITWIKI_NAME = ''
+GITWIKI_NAME = 'knowledge'
 
 # fill path to the git command
-GITCOMMAND = '/usr/local/bin/git'
+GITCOMMAND = '/usr/bin/git'
 
-GITPREFIX = 'cd ' +str(GITWIKI_BASE) + '; ' + str(GITCOMMAND) + ' --git-dir=' \
-        + str(GITWIKI_BASE) + '/' + GITWIKI_NAME + '.git'
+GITPREFIX = 'cd ' +str(GITWIKI_BASE) + '/.. ; ' + str(GITCOMMAND) + ' --git-dir=' \
+        + str(GITWIKI_BASE) 
diff --git a/bn_django/git_wiki/templates/git_wiki/base.html b/bn_django/git_wiki/templates/git_wiki/base.html
index eefaa9a..82884c3 100644
--- a/bn_django/git_wiki/templates/git_wiki/base.html
+++ b/bn_django/git_wiki/templates/git_wiki/base.html
@@ -2,9 +2,9 @@
 
 {% block stylesheets %}
 {{ block.super }}
-<link rel="STYLESHEET" type="text/css" href="style/git_wiki.css" />
-<link rel="STYLESHEET" type="text/css" href="/style/git_wiki.css" />
-<!--<link rel="STYLESHEET" type="text/css" href="http://static.bryannewbold.com/style/git_wiki.css" />-->
+<!--<link rel="STYLESHEET" type="text/css" href="style/git_wiki.css" />
+<link rel="STYLESHEET" type="text/css" href="/style/git_wiki.css" />-->
+<link rel="STYLESHEET" type="text/css" href="http://static.bryannewbold.com/style/git_wiki.css" />
 
 {% endblock %}
 
diff --git a/bn_django/settings.py b/bn_django/settings.py
index 8041cc1..d04cbe7 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 = '/home/bnewbold/bn-project/bn_django/bn_django.db'             # Or path to database file if using sqlite3.
+DATABASE_NAME = '/srv/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/Boston'
+TIME_ZONE = 'America/Seattle'
 
 # 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 = '/home/bnewbold/bn-project/media/'
+MEDIA_ROOT = '/srv/http/bryannewbold/static/'
 
 # URL that handles the media served from MEDIA_ROOT.
 # Example: "http://media.lawrence.com"
-MEDIA_URL = '/media/'
+MEDIA_URL = 'http://static.bryannewbold.com/'
 
 # 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 = '/style/django-admin/'
+ADMIN_MEDIA_PREFIX = 'http://static.bryannewbold.com/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.
-    '/home/bnewbold/bn-project/bn_django/templates',
+    '/srv/django/bn-project/bn_django/templates',
 )
 
 INSTALLED_APPS = (
@@ -86,5 +86,3 @@ INSTALLED_APPS = (
     'bn_django.git_wiki',
     'bn_django.git_browse',
 )
-
-GITBROWSE_BASE = '/home/bnewbold/bn-project/code'
diff --git a/bn_django/templates/base.html b/bn_django/templates/base.html
index ad46a37..ae91f9e 100644
--- a/bn_django/templates/base.html
+++ b/bn_django/templates/base.html
@@ -3,9 +3,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 {% block stylesheets %}
-<link rel="STYLESHEET" type="text/css" href="style/default.css" />
-<link rel="STYLESHEET" type="text/css" href="/style/default.css" />
-<!--<link rel="STYLESHEET" type="text/css" href="http://static.bryannewbold.com/style/default.css" />-->
+<!--<link rel="STYLESHEET" type="text/css" href="style/default.css" />
+<link rel="STYLESHEET" type="text/css" href="/style/default.css" />-->
+<link rel="STYLESHEET" type="text/css" href="http://static.bryannewbold.com/style/default.css" />
 {% endblock %}
 {% block externaljs %} {% endblock %}
 <title>{% block windowtitle %}bryannewbold.com{% endblock %}</title>