From bd872d97d28df54ee87cea76bfffcab972123471 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Tue, 13 Mar 2012 23:03:48 -0500 Subject: [PATCH] eris page --- Makefile | 2 +- index.mdwn | 2 +- portal.cgi | 14 ++++++++++---- src/dwm/index.mdwn | 3 ++- src/eris.mdwn | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/index.mdwn | 1 + 6 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 src/eris.mdwn diff --git a/Makefile b/Makefile index 1e97724..85042a1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DESTDIR = $(HOME)/public_html -TEMPLATE = template.xml +TEMPLATE = template.m4 MDWNTOHTML = ./mdwntohtml $(TEMPLATE) # HTML to be generated diff --git a/index.mdwn b/index.mdwn index 4192326..2b0d7bd 100644 --- a/index.mdwn +++ b/index.mdwn @@ -1,6 +1,6 @@ Title: Neale Pickett Page - +☺ One day a pirate walks into a bar with a steering wheel attached to his crotch. So the bartender says to him, "You know you have a steering wheel attached to your crotch?" diff --git a/portal.cgi b/portal.cgi index 85643e4..fb9deb9 100755 --- a/portal.cgi +++ b/portal.cgi @@ -3,6 +3,10 @@ case "$HTTP_USER_AGENT" in *MIDP*) TINY=1 + NOCAL=1 + ;; + *Mobile*) + NOCAL=1 ;; esac @@ -72,16 +76,18 @@ h2 { } + EOF -[ "$TINY" ] || \ +[ "$NOCAL" ] || \ echo '' -echo '
' -cat $HOME/public_html/activity.txt -echo '
' +if [ "$TINY" ]; then + echo '
' + echo '
' +fi weather diff --git a/src/dwm/index.mdwn b/src/dwm/index.mdwn index 080cb78..b953170 100644 --- a/src/dwm/index.mdwn +++ b/src/dwm/index.mdwn @@ -17,7 +17,8 @@ browser. restarting dwm, multimedia buttons, and [xss](http://woozle.org/~neale/src/xss.html) integration (3 lines of code). -* [My status script](status.sh) is responsible for having DWM show the +* [My status program](http://woozle.org/~neale/gitweb.cgi/status) + is responsible for having DWM show the current time, load average, battery charge, and wifi status. It gracefully handles machines that lack one or more of these features. * [My button script](dwm-button.sh) is invoked when a multimedia button diff --git a/src/eris.mdwn b/src/eris.mdwn new file mode 100644 index 0000000..939db07 --- /dev/null +++ b/src/eris.mdwn @@ -0,0 +1,44 @@ +Title: Eris HTTPd + +Eris HTTPd is a small web server to be run from inetd or tcpserver +(tcpsvd in busybox). It is based on +[fnord HTTPd](http://www.fefe.de/fnord/) but shares very little +code in common now. + +I created eris for [Dirtbags CTF](http://dirtbags.net/ctf/), an +embedded build. But it is also running woozle.org and many +other virtual hosts here. + +Features +-------- + +* Actively maintained +* Small: around 1100 lines of code, 19k binary with glibc +* Fast: as fast as fnord, at least +* Connection keepalive +* thttpd-style virtual domains +* IPv6 and SSL support +* CGI +* Content-Range +* Directory index generation + + +Differences with fnord +---------------------- + +* command-line arguments instead of compile-time defines +* eliminated use of libowfat +* no build dependency of dietlibc +* elimination of "old style symlink handling" +* elimination of user switching (you can use tcpserver -[ug]) +* elimination of chroot code (you can use chroot) +* several bugfixes (sent to the fnord mail list) +* ignores Accept header (fnord does too) + + +Download +-------- + +* [3.0 Release Candidate 1](http://woozle.org/~neale/gitweb.cgi/eris/snapshot/3.0rc1.tar.gz) +* [Version Control](http://woozle.org/~neale/gitweb.cgi/eris) + diff --git a/src/index.mdwn b/src/index.mdwn index d65c75f..f61ea9c 100644 --- a/src/index.mdwn +++ b/src/index.mdwn @@ -8,6 +8,7 @@ of these packages. Networky things ------------------------------- +* [Eris HTTPd](eris.html), a small HTTP (web) server * [pysieved](pysieved.html), a Python ManageSieve server * [Firebot](firebot.html), an easily-extended IRC bot in continuous use since 1996 * [Python IPQUEUE library](ipqueue/)