Merge branch 'master' of ../www.fuck

Conflicts:
	.gitignore
	src/config.d.sample
This commit is contained in:
Jacob Parker 2012-02-24 16:35:34 -05:00
commit d0a579ab51
7 changed files with 70 additions and 28 deletions

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
srv/*
bin/web
.nfs*
.htaccess
src/config.d

53
README.md Normal file
View File

@ -0,0 +1,53 @@
dweb - A simple website written in D
=====
dweb is a simple website framework based off the [werc][werc] software.
Its principles are:
- Database free, uses files and directories instead.
- Written using the D programming language.
- Minimize tedious work: eg., no need to ever write HTML, use markdown instead.
- Very minimalist yet extensible codebase. Handlers for special things should be easy to add.
It was created because werc was annoying to deploy on UW Computer Science Club's Apache setup and because [Not Invented Here](http://en.wikipedia.org/wiki/Not_Invented_Here).
[werc]:http://werc.cat-v.org/
[md]:http://daringfireball.net/projects/markdown
Install Guide
------
You will need:
- An HTTP server with CGI support.
- The D compiler.
Extract the contents into the location you want to serve webpages from. Create <code>$DWEB\_ROOT/.htaccess</code> and <code>$DWEB\_ROOT/src/config.d</code> by copying the provided sample files. Then edit the following files:
- <code>$DWEB_ROOT/.htaccess</code>: make the paths work for your setup.
- <code>$DWEB_ROOT/src/config.d</code>: change these strings as necessary.
- <code>$DWEB_ROOT/src/web.d</code>: this is the main web code.
- <code>$DWEB_ROOT/pub/</code>: static content goes here.
- <code>$DWEB_ROOT/srv/</code>: directories, markdown webpages etc. go in here.
- <code>$DWEB_ROOT/bin/</code>: custom handlers go here.
Run <code>build</code> in <code>$DWEB_ROOT/src</code> to recompile the website software.
Source
--------
You can get the source code on [github](https://github.com/j3parker/dweb) or by running
git clone git://github.com/j3parker/dweb.git
Contact
--------
For questions, suggestions, bug reports and contributing patches email [j3parker](mailto:j3parker@csclub.uwaterloo.ca)
License
-------
Public domain.
Credits
-------
The idea and css stolen from [werc][werc]. This page itself also plagarised.
Thanks to John Gruber for the [Markdown.pl][md] script.

4
htaccess-sample Normal file
View File

@ -0,0 +1,4 @@
RewriteEngine on
RewriteBase /
RewriteRule ^pub/(.*) - [L]
RewriteRule ^(.*) bin/web [L]

View File

@ -1 +1,2 @@
cd "$(dirname $0)"
dmd config.d web.d -ofweb && rm web.o && mv web ../bin/

View File

@ -1,18 +0,0 @@
const string url_root = "/~j3parker/pub/csc/";
const string site_title = "CSC";
const string site_subtitle = "UW Computer Science Club";
const bool nav_tree_vert = false;
const bool nav_tree_chev = false;
const bool page_container = true;
string[string] handlers;
void init_handlers() {
handlers["*.md"] = "contrib/Markdown.pl";
handlers["changelog"] = "changelog.sh";
handlers["About/Members/"] = "members.py";
handlers["About/Members/?*"] = "member_info.py";
handlers["About/Executive/"] = "exec_positions.py";
}

View File

@ -108,7 +108,7 @@ void do_content(string url) {
}
}
// if that failed, see if we can handle the file
if (url == "" ? false : url[$-1] == '/') url ~= "index";
if (url == "" ? true : url[$-1] == '/') url ~= "index";
foreach (f; array(map!"a.name"(dirEntries(dirName(dweb_root ~ "/srv/" ~ url), SpanMode.shallow)))) {
if (isDir(f)) continue;
string name = baseName(f); name = name[0] == '@' ? name[1..$] : name;
@ -153,7 +153,7 @@ void main(string[] args) {
html("<!DOCTYPE html>");
html_push("<html>\n");
string url = getenv("SCRIPT_URL")[url_root.length..$];
string url = getenv("REQUEST_URI")[url_root.length..$];
if (evil(url)) { html ("bad url."); return; }
string pagename = baseName(url);

View File

@ -1,6 +1,6 @@
dweb - A simple website written in D
=====
dweb is a simple website framework based off the [werc][werc] software.
dweb is a simple website framework inspired by the [werc][werc] software.
Its principles are:
@ -22,14 +22,14 @@ You will need:
Extract the contents into the location you want to serve webpages from. Edit the following files:
- <code>$DWEB_ROOT/.htaccess</code>: make the paths work for your setup.
- <code>$DWEB_ROOT/src/config.d</code>: change these strings as necessary.
- <code>$DWEB_ROOT/src/web.d</code>: this is the main web code.
- <code>$DWEB_ROOT/pub/</code>: static content goes here.
- <code>$DWEB_ROOT/srv/</code>: directories, markdown webpages etc. go in here.
- <code>$DWEB_ROOT/bin/</code>: custom handlers go here.
- `$DWEB_ROOT/.htaccess`: make the rewrite path work for your setup.
- `$DWEB_ROOT/src/config.d`: change these things as desired. Custom handlers are added in init_handlers. The key is the glob to activate the handler, and the value is the `bin/` relative path of the handler.
- `$DWEB_ROOT/src/web.d`: this is the core code.
- `$DWEB_ROOT/pub/`: static content goes here.
- `$DWEB_ROOT/srv/`: directories, markdown webpages etc. go in here.
- `$DWEB_ROOT/bin/`: custom handlers go here.
Run <code>build</code> in <code>$DWEB_ROOT/src</code> to recompile the website software.
Run `./build` in `$DWEB_ROOT/src` to recompile the website software.
Source
--------