diff options
| author | bnewbold <bnewbold@manus.(none)> | 2007-02-24 22:19:26 -0800 |
|---|---|---|
| committer | bnewbold <bnewbold@manus.(none)> | 2007-02-24 22:19:26 -0800 |
| commit | 6b56fa9f477ac65440cb10428aac93b1ed68b5eb (patch) | |
| tree | 40a954bfa1ffe3c346962e84a0325f1e132ea522 /bn_django/git_wiki | |
| parent | 3beb31d829e87f32fa89a36d46390f9560d92974 (diff) | |
| parent | ed9e597e32c7a118e47eced3b07974297945e40b (diff) | |
| download | bnewnet-6b56fa9f477ac65440cb10428aac93b1ed68b5eb.tar.gz bnewnet-6b56fa9f477ac65440cb10428aac93b1ed68b5eb.zip | |
Merge branch 'production' of animus:/srv/django/bn-project/ into comments
Diffstat (limited to 'bn_django/git_wiki')
| -rw-r--r-- | bn_django/git_wiki/models.py | 12 | ||||
| -rw-r--r-- | bn_django/git_wiki/settings.py | 10 | ||||
| -rw-r--r-- | bn_django/git_wiki/templates/git_wiki/base.html | 6 |
3 files changed, 14 insertions, 14 deletions
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 %} |