Permalink
Browse files

Merge pull request #36 from cgay/master

koala -> http-server
  • Loading branch information...
2 parents c2717a8 + 6fc90ad commit 12c2aabdf6616cf70eb9620395de8a8ea3d523c7 @waywardmonkeys waywardmonkeys committed Dec 30, 2012
Showing with 15 additions and 15 deletions.
  1. +6 −6 README.rst
  2. +3 −3 config.xml
  3. +2 −2 dylan/library.dylan
  4. +2 −2 dylan/main.dylan
  5. +1 −1 dylan/user.dylan
  6. +1 −1 dylan/wiki.lid
View
12 README.rst
@@ -21,7 +21,7 @@ Configuration
You will need to tweak these values in the config file:
-* **koala.wiki.git-main-repository-root** -- Make it point to the root
+* **http-server.wiki.git-main-repository-root** -- Make it point to the root
directory of your wiki git repository. Example::
$ cd
@@ -31,7 +31,7 @@ You will need to tweak these values in the config file:
<wiki git-main-repository-root = "/home/you/wiki-data" ...>
-* **koala.wiki.git-user-repository-root** -- Make this point to the
+* **http-server.wiki.git-user-repository-root** -- Make this point to the
root directory of the user data repository. This is separate from
the page and group data so that it can easily be backed-up
separately (e.g., by pushing to a different remote). Example::
@@ -43,18 +43,18 @@ You will need to tweak these values in the config file:
<wiki user-repository = "/home/you/wiki-user-data" ...>
-* **koala.wiki.git-executable** -- If the "git" executable is not on the
+* **http-server.wiki.git-executable** -- If the "git" executable is not on the
path of the user running the wiki, then you need to specify it in
the <wiki> element::
<wiki git-executable = "/usr/bin/git" ... />
-* **koala.wiki.static-directory** -- Make it point at the "www" subdirectory
+* **http-server.wiki.static-directory** -- Make it point at the "www" subdirectory
(I guess this should be made relative to <server-root>.)
-* **koala.wiki.administrator.password** -- Choose a password you like.
+* **http-server.wiki.administrator.password** -- Choose a password you like.
-* **koala.wiki.rst2html** -- Path to the rst2html executable.
+* **http-server.wiki.rst2html** -- Path to the rst2html executable.
Startup
View
6 config.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!-- The wiki settings are documented here.
- See the default koala-config.xml for documentation on Koala settings.
+ See the default config.xml for documentation on HTTP server settings.
-->
-<koala>
+<http-server>
<listener address="0.0.0.0" port="8000"/>
<server
@@ -60,4 +60,4 @@
<authentication realm="dylan-wiki"/>
<mail host="localhost"/>
</wiki>
-</koala>
+</http-server>
View
4 dylan/library.dylan
@@ -14,8 +14,8 @@ define library wiki
use dylan;
use graphviz-renderer;
use http-common;
+ use http-server;
use io;
- use koala;
use network;
use smtp-client;
use strings;
@@ -73,7 +73,7 @@ define module %wiki
use format-out;
use http-common,
exclude: { remove-attribute };
- use koala;
+ use http-server;
use locators,
exclude: { <http-server>, <url> };
use operating-system;
View
4 dylan/main.dylan
@@ -441,8 +441,8 @@ define function main
let filename = locator-name(as(<file-locator>, application-name()));
if (split(filename, ".")[0] = "wiki")
// This eventually causes process-config-element (above) to be called.
- koala-main(description: "Dylan Wiki",
- before-startup: initialize-wiki);
+ http-server-main(description: "Dylan Wiki",
+ before-startup: initialize-wiki);
end;
end;
end function main;
View
2 dylan/user.dylan
@@ -11,7 +11,7 @@ define thread variable *authenticated-user* = #f;
// The default "realm" value passed in the WWW-Authenticate header.
//
-define variable *default-authentication-realm* :: <string> = "koala";
+define variable *default-authentication-realm* :: <string> = "dylan-wiki";
// Because clients (browsers) continue to send the Authentication header
// once an authentication has been accepted (at least until the browser
View
2 dylan/wiki.lid
@@ -11,6 +11,6 @@ Files: library
git-storage
main
Other-files: ../README.rst
- ../koala-config.xml
+ ../config.xml
../TODO
../rst2html-template.txt

0 comments on commit 12c2aab

Please sign in to comment.