DONE -> del

[wiki.git] / projects / www.mdwn

diff --git a/projects/www.mdwn b/projects/www.mdwn
index 4076c3150df0e57e2067edabc12616d5c6d84b1b..9c6f82bb179b46b55b67f220f61eb792d3cd098f 100644 (file)
--- a/projects/www.mdwn
+++ b/projects/www.mdwn
@@ -19,7 +19,6 @@
 * migrate sipb.mit.edu/doc
 * usability tests
 * table of contents doesn't work
-* editing pages adds lots of extra slashes to the path
 
 ### Done
 * commit zephyrs for git (ikiwiki.git)
@@ -35,19 +34,8 @@
 ###When a request comes in:
  a connection comes in for sipb.mit.edu which via a hack in MIT DNS gets directed instead to PENGUIN-LUST.MIT.EDU. If its on ports 80, (443?), or 444 it gets passed off to scripts (where it's handled by b-m or b-k, whichever).
 
-scripts has a special vhost config (/etc/httpd/vhost.d/sipb.conf) for
-sipb.mit.edu:
-
-        DocumentRoot /afs/sipb.mit.edu/project/sipb-www/web_scripts/wiki
-        Alias /doc /afs/sipb.mit.edu/project/sipb-www/web_scripts/doc
-        Alias /iap /afs/sipb.mit.edu/project/sipb-www/web_scripts/iap
-        Alias /cgit /afs/sipb.mit.edu/project/sipb-www/web_scripts/cgit
-        Alias /~sipb-www /afs/sipb.mit.edu/project/sipb-www/web_scripts
-
-For our purposes the key line is the first, meaning that URIs not
-falling into an exception are served straight out of
-web_scripts/wiki/.  This directory's contents are generated by ikiwiki
-after each edit, consisting of HTML files and a program ikiwiki.cgi.
+The DocumentRoot for sipb.mit.edu is `/afs/sipb.mit.edu/project/sipb-www/web_scripts/sipb`.  This directory contains a `.htaccess` file that causes most URIs to be served out of `web_scripts/sipb/_wiki`, a symlink to `../../Scripts/wiki`.  This directory's contents are static files generated by ikiwiki
+after each edit.
 
 ###For development's sake:
 
@@ -58,15 +46,17 @@ When you commit, ikiwiki should get automatically republished as HTML.
 
 To work on the code surrounding the wiki in addition to the wikitext, clone the superrepo:
 
-  $ git clone git+ssh://sipb-www@scripts.mit.edu/mit/sipb-www/git/sipb-www
-  $ cd sipb-www
-  $ git submodule update --init
+    $ git clone git+ssh://sipb-www@scripts.mit.edu/mit/sipb-www/git/sipb-www
+    $ cd sipb-www
+    $ git submodule update --init
 
 
 ####Detailed Locker Layout
 
     .
     |-- Scripts
+    |   |-- wiki: the published HTML that you are being served right now
+    |   |-- wiki-cgi: CGI scripts for the wiki
     |   \-- writable: directory containing files writable by scripts
     |                 dotfiles such as .bash_history are symlinked here
     |-- arch
@@ -88,14 +78,13 @@ To work on the code surrounding the wiki in addition to the wikitext, clone the
     |   |               variation on ikiwiki.
     |   `-- old.ikiwiki: irrelevant
     |-- web_scripts
-    |   |-- RCS: .htaccess must be versioned
     |   |-- cgit: what you look at when you click on "History"
     |   |-- doc: the old Trac wiki
-    |   |-- iap -> /mit/sipb-iap/www
     |   |-- radiant: old and irrelevant
     |   |-- rtfm: contains an index.html identical to rtfm.html below
-    |   |-- rtfm.html: served for rtfm.mit.edu:80
-    |   `-- wiki: the published HTML that you are being served right now
+    |   `-- sipb: the document root for sipb.mit.edu
+    |       |-- _wiki -> ../../Scripts/wiki
+    |       `-- _wiki-cgi -> ../../Scripts/wiki-cgi
     |-- web_scripts_tmp: old directory around to keep trac up-to-date. Should
     |                    vanish sooner or later
     `-- wiki.git: this is where all the content lives as markdown.