diff --git a/birds/index.mdwn b/birds/index.mdwn index 8b5db27..ab6a507 100644 --- a/birds/index.mdwn +++ b/birds/index.mdwn @@ -24,3 +24,4 @@ BURD(sneakums.png, It looks kind and gentle but sneakums' bird would just as soo BURD(rasher.png, HI GUYS HOW'S IT GOING DO YOU LIKE SEEDS by rasher) BURD(teferi.jpg, Someone just told teferi's bird a really terrible joke.) BURD(bz2.jpg, I never thought I'd see a bird with a pompadour`,' but bz2 has made that happen.) +BURD(pedro.jpg, Pedro has been watching too many Michael Bay movies.) diff --git a/birds/pedro.jpg b/birds/pedro.jpg new file mode 100644 index 0000000..cc4633b Binary files /dev/null and b/birds/pedro.jpg differ diff --git a/derby.mdwn b/derby.mdwn new file mode 100644 index 0000000..f9425a5 --- /dev/null +++ b/derby.mdwn @@ -0,0 +1,22 @@ +Title: Roller Derby Stuff + +We provide Roller Derby software and advice, aimed at small- to medium-sized +leagues. We strive to make our software: + +* Free: no ads, no fees, forever +* Open: download and modify the provided source code +* Clean: fans and NSOs should focus on the game, not our software +* Easy: quickly-learned and intuitive interfaces + +Software +-------- + +* [Scoreboard](http://woozle.org/scoreboard/), works in any web browser +* [Penalty Timer (Android)](https://play.google.com/store/apps/details?id=org.woozle.penaltytimer) +* [Track](http://woozle.org/track/) with movable players +* Penalty Timer (iPhone/iPad) *coming soon* + +Articles +-------- + +* [Running A/V for a Bout](http://woozle.org/~neale/papers/derby-av.html) diff --git a/google7f698b9893809122.html b/google7f698b9893809122.html index e69de29..3dd2c63 100644 --- a/google7f698b9893809122.html +++ b/google7f698b9893809122.html @@ -0,0 +1 @@ +google-site-verification: google7f698b9893809122.html \ No newline at end of file diff --git a/index.mdwn b/index.mdwn index 9d2da75..e13f15c 100644 --- a/index.mdwn +++ b/index.mdwn @@ -1,18 +1,32 @@ Title: Home
Username - + Password - - + +
-Nov 9: Web site changes -======================= +Woozle.org provides shells, email, and web hosting for no cost, +without advertisements, and with a focus on security. Accounts are +held by folks who know the right person to ask. -I'm twiddling with the web site. Webmail should be fine but other things may -be up and down throughout the day. + + +8 Mar: More web server suckage +------------------------------ + +I'm trying to get woozle.org ready for IPv6, using the same software +we run in [Dirtbags CTF](http://dirtbags.net/ctf/). I *thought* I had +the web server up and working, but apparently I broke webmail logins. + +Thanks to the vigilant woozle user who phoned me to let me know it was +busted. + +Uptime for the web server is pretty horrible lately. My apologies. diff --git a/lists.cgi b/lists.cgi index 7036cf1..0cac0df 100755 --- a/lists.cgi +++ b/lists.cgi @@ -23,7 +23,7 @@ def getdesc(d): return '(none)' ret = desc_re.search(hdrs) if ret: - return ret.group(1) + return cgi.escape(ret.group(1)).replace('#', '') else: return '(none)' @@ -47,10 +47,8 @@ if l and os.path.isdir(os.path.join(listdir, 'control')): content = "

Uh oh. That didn't work.

" content += "
%s
" % cgi.escape(str(err)) else: - desc = getdesc(listdir) content = '

%s@woozle.org' % l - if desc: - content += ": %s" % cgi.escape(desc) + content += ": %s" % getdesc(listdir) content += '

' content += '

To subscribe to or unsubscribe from the %s list,' % l content += ' just enter your email address in this handy dandy form!

' @@ -83,9 +81,9 @@ else: continue l = os.path.basename(d) - content += '%s' % (l, l) + content += '%s' % (l, l) content += '%s' % getdesc(d) - content += '
' + content += '' content += ' ' content += '
' % l content += ' ' diff --git a/mail.cgi.c b/mail.cgi.c new file mode 100644 index 0000000..ea9df69 --- /dev/null +++ b/mail.cgi.c @@ -0,0 +1,24 @@ +#include +#include +#include +#include + +const char *basepath = "/usr/share/IlohaMail/source"; + +int +main(int argc, char *argv[]) +{ + char *pathinfo = getenv("PATH_INFO"); + char filename[512]; + + if ((! pathinfo) || + (! strcmp(pathinfo, "/")) || + (0 == strcmp(pathinfo, "/index.html"))) { + pathinfo = "/index.php"; + } + snprintf(filename, sizeof filename, "%s%s", basepath, pathinfo); + setenv("SCRIPT_FILENAME", filename, 1); + execl("/usr/bin/php-cgi", filename, NULL); + + return 0; +} diff --git a/people.sh b/people.sh index 5d9f1aa..62ac05b 100755 --- a/people.sh +++ b/people.sh @@ -2,10 +2,14 @@ echo 'Title: People' echo +echo 'The following people have made public homepages:' +echo ls /home/*/public_html/index.html | while read fn; do a=${fn#/home/} u=${a%/public_html/index.html} + l=/srv/www/woozle.org/~$u - echo "* [$u](/~$u)" + echo "* [$u](/~$u/)" + [ -h $l ] || ln -s /home/$u/public_html $l done diff --git a/scoreboard/scoreboard.mk b/scoreboard/scoreboard.mk new file mode 100644 index 0000000..0a7490a --- /dev/null +++ b/scoreboard/scoreboard.mk @@ -0,0 +1,8 @@ +TARGETS += $(DESTDIR)/scoreboard/index.html + +$(DESTDIR)/scoreboard/.git: + cd $(DESTDIR); git clone /home/neale/projects/scoreboard + +$(DESTDIR)/scoreboard/index.html: $(DESTDIR)/scoreboard/.git +$(DESTDIR)/scoreboard/index.html: /home/neale/projects/scoreboard + cd $(DESTDIR)/scoreboard; git pull diff --git a/style-black.css b/style-black.css new file mode 100644 index 0000000..e464d44 --- /dev/null +++ b/style-black.css @@ -0,0 +1,82 @@ +html { + font-family: sans-serif; + background: black; +} + +body { + margin: auto; + color: #636; + background: black; + padding: 1em; +} + +body h1:first-child { + font-size: 1.5em; + font-weight: bold; + color: #ccc; + margin: 0; +} +body h1:first-child:before { + font-size: 300%; + font-weight: normal; + content: "Woozle"; + padding-right: 1em; +} + +nav { + font-size: 80%; + margin: 0; + padding: 0; +} +nav ul { + background-color: #222; + margin: 0; + padding: 0 1em; +} +nav li { + font-weight: bold; + display: inline; + padding: 0 1em; +} + +a { + text-decoration: none; + color: #e8b; +} +a:hover { + text-decoration: underline; +} + +h1 { + font-size: 150%; + border-bottom: 1px solid #ddd; +} + + +.login { + margin: 0 1em; + color: #e8b; + background: #333; + border: 1px solid #eee; + text-align: center; +} + +.login input { + border: 1px solid #ddd; + color: #bbb; + background: #111; + font-weight: bold; +} + +a img +{ + border: 1px #e8b solid; +} +img.left { + float: left; + margin-right: 10px; +} + +pre { + background-color: #444; +} diff --git a/style.css b/style.css index e1e1a74..4b12628 100644 --- a/style.css +++ b/style.css @@ -11,13 +11,13 @@ body { padding: 1em; } -body h1:first-child { +h1#title { font-size: 1.5em; font-weight: bold; color: #ccc; margin: 0; } -body h1:first-child:before { +h1#title:before { font-size: 300%; font-weight: normal; content: "Woozle"; @@ -53,6 +53,10 @@ h1 { border-bottom: 1px solid #ddd; } +h2 { + font-size: 115%; +} + .login { margin: 0 1em; diff --git a/template.html.m4 b/template.html.m4 index ccadfaa..4ded141 100644 --- a/template.html.m4 +++ b/template.html.m4 @@ -2,18 +2,19 @@ TITLE - - - + + + -

TITLE

+

TITLE

divert(1) diff --git a/track/track.mk b/track/track.mk new file mode 100644 index 0000000..5386cbb --- /dev/null +++ b/track/track.mk @@ -0,0 +1,7 @@ +TARGETS += $(DESTDIR)/track/index.html + +$(DESTDIR)/track/.git: + cd $(DESTDIR); git clone /home/neale/projects/track + +$(DESTDIR)/track/index.html: $(DESTDIR)/track/.git + cd $(DESTDIR)/track; git pull diff --git a/woozle.mk b/woozle.mk index bdce135..3570b8c 100644 --- a/woozle.mk +++ b/woozle.mk @@ -1,6 +1,11 @@ PLAIN += . -COPY += icon.png style.css lists.cgi wishlist.cgi set.cgi $(TEMPLATE) +COPY += icon.png style.css style-black.css lists.cgi wishlist.cgi set.cgi $(TEMPLATE) +COPY += mail.cgi +COPY += google7f698b9893809122.html HTML += people.html -$(DESTDIR)/people.html: people.sh +$(DESTDIR)/people.html: people.sh template.html.m4 sh $< | $(MDWNTOHTML) > $@ + +$(DESTDIR)/mail.cgi: mail.cgi.c + $(CC) -Wall -Werror -o $@ $< diff --git a/xmas/2011/DSC03851.jpg b/xmas/2011/DSC03851.jpg new file mode 100644 index 0000000..9947300 Binary files /dev/null and b/xmas/2011/DSC03851.jpg differ diff --git a/xmas/2011/IMG_1329.jpg b/xmas/2011/IMG_1329.jpg new file mode 100644 index 0000000..0c0e3ac Binary files /dev/null and b/xmas/2011/IMG_1329.jpg differ diff --git a/xmas/2011/IMG_1368.jpg b/xmas/2011/IMG_1368.jpg new file mode 100755 index 0000000..c5eb8de Binary files /dev/null and b/xmas/2011/IMG_1368.jpg differ diff --git a/xmas/2011/IMG_1469.jpg b/xmas/2011/IMG_1469.jpg new file mode 100755 index 0000000..67cd563 Binary files /dev/null and b/xmas/2011/IMG_1469.jpg differ diff --git a/xmas/2011/IMG_1493.jpg b/xmas/2011/IMG_1493.jpg new file mode 100644 index 0000000..a0ac171 Binary files /dev/null and b/xmas/2011/IMG_1493.jpg differ diff --git a/xmas/2011/IMG_20110312_095807.jpg b/xmas/2011/IMG_20110312_095807.jpg new file mode 100644 index 0000000..89ce5dc Binary files /dev/null and b/xmas/2011/IMG_20110312_095807.jpg differ diff --git a/xmas/2011/IMG_20110328_110408.jpg b/xmas/2011/IMG_20110328_110408.jpg new file mode 100644 index 0000000..f0cc6a7 Binary files /dev/null and b/xmas/2011/IMG_20110328_110408.jpg differ diff --git a/xmas/2011/IMG_20110425_124754.jpg b/xmas/2011/IMG_20110425_124754.jpg new file mode 100644 index 0000000..7159144 Binary files /dev/null and b/xmas/2011/IMG_20110425_124754.jpg differ diff --git a/xmas/2011/IMG_20110626_201950.jpg b/xmas/2011/IMG_20110626_201950.jpg new file mode 100644 index 0000000..3570300 Binary files /dev/null and b/xmas/2011/IMG_20110626_201950.jpg differ diff --git a/xmas/2011/IMG_20110717_122045.jpg b/xmas/2011/IMG_20110717_122045.jpg new file mode 100644 index 0000000..698dde9 Binary files /dev/null and b/xmas/2011/IMG_20110717_122045.jpg differ diff --git a/xmas/2011/IMG_4888.jpg b/xmas/2011/IMG_4888.jpg new file mode 100644 index 0000000..4849c8d Binary files /dev/null and b/xmas/2011/IMG_4888.jpg differ diff --git a/xmas/2011/IMG_4958.jpg b/xmas/2011/IMG_4958.jpg new file mode 100644 index 0000000..722e0b4 Binary files /dev/null and b/xmas/2011/IMG_4958.jpg differ diff --git a/xmas/2011/arrr.jpg b/xmas/2011/arrr.jpg new file mode 100644 index 0000000..dddfbed Binary files /dev/null and b/xmas/2011/arrr.jpg differ diff --git a/xmas/2011/index.mdwn b/xmas/2011/index.mdwn new file mode 100644 index 0000000..c0454b0 --- /dev/null +++ b/xmas/2011/index.mdwn @@ -0,0 +1,70 @@ +Title: 2011 Christmas Letter + +This was a year of firsts. Ginnie had her first sleep-over, performed at her first Irish dance recital, + +IMAGE(IMG_1329) +IMAGE(IMG_4888) + + +She got her first Ghillies, + +IMAGE(IMG_1493) + +competed in her first Irish Dance Competition, + +IMAGE(DSC03851) + +did her first ballet recital without an older girl leading, + +IMAGE(IMG_1368) + +and went on her first self-supported hike. + +IMAGE(IMG_20110328_110408) + +She sold her first (and last) Girl Scout Cookies: the top seller for her troupe! + +IMAGE(IMG_20110312_095807) + +She went to Disneyland for the first time + +IMAGE(arrr) +IMAGE(tamarrr) + +She went to her first Roller Derby bout + +IMAGE(IMG_20110717_122045) + +Evacuated town for the first time + +IMAGE(IMG_20110626_201950) + +Rode her bike by herself for the first time + + + +Read her first book by herself + + + +Had her first motorcycle ride + +IMAGE(IMG_1469) + + +And ate her first Tofurky (she liked it!) + +IMAGE(IMG_4958) + + + + + +Amy and Neale had a lot of fun coffee dates this year + +IMAGE(IMG_20110425_124754) + +Love, + + +The Picketts (Neale, Amy, Ginnie, and the dogs, Dingo & Jada) diff --git a/xmas/2011/tamarrr.jpg b/xmas/2011/tamarrr.jpg new file mode 100644 index 0000000..f9ea724 Binary files /dev/null and b/xmas/2011/tamarrr.jpg differ