From a767291ce9d525f0077463643efc896d79428fcf Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sat, 29 Dec 2007 20:25:26 +0000 Subject: [PATCH 1/1] Further simplify web setup. - The default icons directory now matches the instructions. - vhost-specific setup is moved to a README Organization: Straylight/Edgeware From: rjk@greenend.org.uk <> --- Makefile.am | 2 +- README | 43 +++++++++------------------------------- README.vhost | 21 ++++++++++++++++++++ templates/options.labels | 4 ++-- 4 files changed, 33 insertions(+), 37 deletions(-) create mode 100644 README.vhost diff --git a/Makefile.am b/Makefile.am index b8318a4..99d2fd2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # EXTRA_DIST=TODO CHANGES README.streams BUGS ChangeLog.d \ -README.upgrades README.client README.mac README.raw +README.upgrades README.client README.mac README.raw README.vhost SUBDIRS=@subdirs@ check-report: before-check check make-coverage-reports diff --git a/README b/README index c0b3dd7..a80c1cc 100644 --- a/README +++ b/README @@ -181,7 +181,8 @@ Web Interface "Thought I was a gonner baby, but I'm bullet proof" -These instructions assumes you are using Apache 1.3.x. +As above, if you install from a .deb, much of the work will be done +automatically. You need to configure a number of things to make this work: @@ -205,48 +206,21 @@ You need to configure a number of things to make this work: If you don't want to allow online registration instead use: - disorder -- setup-guest --no-online-registration + disorder setup-guest --no-online-registration -3a. If you want to have a 'jukebox' virtual host, modify the DNS accordingly - and use a fragment such as this one: - - - DocumentRoot /home/jukebox/public_html - ServerName jukebox.DOMAIN - ServerAlias jukebox - ServerAdmin webmaster@DOMAIN - ErrorLog /var/log/apache/jukebox/error.log - TransferLog /var/log/apache/jukebox/access.log - Alias /static/ /usr/local/share/disorder/static/ - - - Don't forget to reload Apache after modifying its configuration. - - You must tell the web interface how to find its icons and stylesheet: - - echo label url.static /static/ >> /etc/disorder/options.user - echo label links.css /static/disorder.css >> /etc/disorder/options.user - -3b. If you don't want a virtual host then you must still make sure that - DisOrder can find its icons and stylesheet. For example in your web server - configuration: +3. Make sure that DisOrder can find its icons and stylesheet. For example in + your web server configuration: Alias /disorder/ /usr/local/share/disorder/static/ Alternatively you could use a symlink from the right location in your document root, provided your web server is configured to follow them. - Also you must tell the web interface how to find them: - - echo label url.static /disorder/ >> /etc/disorder/options.user - echo label links.css /disorder/disorder.css >> /etc/disorder/options.user + cd /var/www + ln -s /usr/local/share/disorder/static disorder 4. Install disorder.cgi in an appropriate location. Remember to make it - executable. For example assuming a virtual host as above (3a): - - install -m 755 clients/disorder.cgi ~jukebox/public_html/index.cgi - - or not (3b): + executable. Example: install -m 755 clients/disorder.cgi /usr/lib/cgi-bin/disorder @@ -272,6 +246,7 @@ You need to configure a number of things to make this work: set of initial choices to anything that can be expressed with regexps. The regexps must be URL-encoded UTF-8 PCRE regexps. +If you want to give DisOrder its own virtual host, see README.vhost. Copyright ========= diff --git a/README.vhost b/README.vhost new file mode 100644 index 0000000..74922bf --- /dev/null +++ b/README.vhost @@ -0,0 +1,21 @@ +If you want to give DisOrder's web interface its own virtual domain +then for Apache 1.3 you'll want something like this: + + + DocumentRoot /home/jukebox/public_html + ServerName jukebox.DOMAIN + ServerAlias jukebox + ServerAdmin webmaster@DOMAIN + ErrorLog /var/log/apache/jukebox/error.log + TransferLog /var/log/apache/jukebox/access.log + Alias /disorder/ /usr/local/share/disorder/static/ + + +You would then install the CGI as follows: + + install -m 755 clients/disorder.cgi ~jukebox/public_html/index.cgi + +Local Variables: +mode:text +fill-column:79 +End: diff --git a/templates/options.labels b/templates/options.labels index f72ab84..249d6ae 100644 --- a/templates/options.labels +++ b/templates/options.labels @@ -203,9 +203,9 @@ label heading.length Length # (Possibly relative) URL to images. This be a URL for the directory # containing the icons used by the web interface (which might be # /usr/local/share/disorder/static/). -label url.static static/ +label url.static /disorder/ # Stylesheet. As above, a (possibly relative) URL, but this time pointing # to the stylesheet to use in all DisOrder web pages. -label links.css static/disorder.css +label links.css /disorder/disorder.css -- [mdw]