From: admin <admin@branchable.com>
Date: Sun, 9 Jan 2011 15:46:30 +0000 (+0000)
Subject: configured domains
X-Git-Url: https://source.charles.plessy.org/?a=commitdiff_plain;h=8e0d6cc8075dc265c277a53f3a33c5b1ca47514d;p=source--%2F.git

configured domains
---

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 1c1eba06..7fa8863b 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -21,9 +21,9 @@ srcdir: /home/b-charles-plessy-org/source
 # where to build the wiki
 destdir: /home/b-charles-plessy-org/public_html
 # base url to the wiki
-url: http://charles-plessy-org.branchable.com
+url: http://charles.plessy.org
 # url to the ikiwiki.cgi
-cgiurl: http://charles-plessy-org.branchable.com/ikiwiki.cgi
+cgiurl: http://charles.plessy.org/ikiwiki.cgi
 # filename of cgi wrapper to generate
 cgi_wrapper: /home/b-charles-plessy-org/public_html/ikiwiki.cgi
 # mode for cgi_wrapper (can safely be made suid)
@@ -238,8 +238,9 @@ po_link_to: negotiated
 
 ######################################################################
 # web plugins
-#   (404, attachment, comments, editdiff, edittemplate, google, goto,
-#    mirrorlist, remove, rename, repolist, search, theme, websetup, wmd)
+#   (404, attachment, comments, editdiff, edittemplate, getsource, google,
+#    goto, mirrorlist, remove, rename, repolist, search, theme, websetup,
+#    wmd)
 ######################################################################
 
 # attachment plugin
@@ -262,6 +263,10 @@ comments_pagename: comment_
 # commit comments to the VCS
 comments_commit: 1
 
+# getsource plugin
+# Mime type for returned source.
+#getsource_mimetype: text/plain; charset=utf-8
+
 # mirrorlist plugin
 # list of mirrors
 #mirrorlist: {}
@@ -359,6 +364,8 @@ aggregateinternal: 1
 # ikiwikihosting plugin
 # list of urls that alias to the main url
 urlalias:
+  - http://charles-plessy-org.branchable.com/
+  - http://charles-plessy-org.branchable.com/
   - http://www.charles.plessy.org/
 # openid of primary site owner
 owner: https://launchpad.net/~plessy