diff options
| author | Karl Semich <0xloem@gmail.com> | 2016-08-28 01:57:50 -0400 |
|---|---|---|
| committer | Karl Semich <0xloem@gmail.com> | 2016-08-28 01:57:50 -0400 |
| commit | 91262e2c23ed5bff8d6471e3a8a7aeb9461a2f7b (patch) | |
| tree | c770a496b0df90828c7f878e41b2cc604b0afbb7 | |
| parent | eb1bad975acec542884865f25cad57f0bbb6122a (diff) | |
| download | standingwithresilience-91262e2c23ed5bff8d6471e3a8a7aeb9461a2f7b.tar.gz standingwithresilience-91262e2c23ed5bff8d6471e3a8a7aeb9461a2f7b.zip | |
Setup ikiwiki for git
| -rw-r--r-- | backend/ikiwiki.setup | 21 | ||||
| -rw-r--r-- | backend/resilient/__init__.py | 2 |
2 files changed, 14 insertions, 9 deletions
diff --git a/backend/ikiwiki.setup b/backend/ikiwiki.setup index e58ddbc..0d71995 100644 --- a/backend/ikiwiki.setup +++ b/backend/ikiwiki.setup @@ -40,6 +40,7 @@ rcs: '' # plugins to add to the default configuration add_plugins: - ikistrap +- repolist # plugins to disable disable_plugins: [] # additional directory to search for template files @@ -218,8 +219,8 @@ pingurl: [] ###################################################################### # web plugins # (404, attachment, comments, editdiff, edittemplate, getsource, google, -# goto, mirrorlist, remove, rename, repolist, search, theme, userlist, -# websetup, wmd) +# goto, ikistrap, mirrorlist, remove, rename, repolist, search, theme, +# userlist, websetup, wmd) ###################################################################### # attachment plugin @@ -248,6 +249,10 @@ pingurl: [] # Mime type for returned source. #getsource_mimetype: text/plain; charset=utf-8 +# ikistrap plugin +# install Bootstrap css and js files locally instead of using bootstrapcdn? +bootstrap_local: 1 + # mirrorlist plugin # list of mirrors #mirrorlist: {} @@ -256,8 +261,12 @@ pingurl: [] # repolist plugin # URIs of repositories containing the wiki's source -#repositories: -#- svn://svn.example.org/wiki/trunk +repositories: +- git://standingwithresilience.branchable.com/ +- http://bitno.com:43110/1GtQ8bkFkhYtKerSdXHKe1z4j9VTmFR5d4/.git +- http://bitno.com:43110/1L363bqJnCG63SnV83kfV7izZXbmentctD/.git +- https://ipfs.io/ipns/QmPw1ZqrdEma823zTrnH9cVFF4j3YSeedrRjqPGj9Q8Utx/.git +- https://ipfs.io/ipns/QmYMViYhjtwH2BkuHYRGJvPDWcXdNf2YcRFTTCzzqQGVn1/.git # search plugin # path to the omega cgi program @@ -378,7 +387,3 @@ recentchangesnum: 100 #tag_autocreate: 1 # commit autocreated tag pages #tag_autocreate_commit: 1 - -# ikistrap plugin -# css/js/fonts are stored locally -bootstrap_local: 1 diff --git a/backend/resilient/__init__.py b/backend/resilient/__init__.py index c8675d2..424c73c 100644 --- a/backend/resilient/__init__.py +++ b/backend/resilient/__init__.py @@ -80,7 +80,7 @@ class ikiwiki: shutil.rmtree(html_path) os.mkdir(html_path) - status = os.system("ikiwiki --setup '%s' '%s' '%s'" % (ikiwiki_setup_path, wiki_src_path, html_path)) + status = os.system("ikiwiki --rcs git --setup '%s' '%s' '%s'" % (ikiwiki_setup_path, wiki_src_path, html_path)) # workaround for ikistrap overwriting custom css files, which are included for freenet's filter os.system("git checkout -- '%s'/css" % html_path) |