From 1d914d777af8d67f8407f9bfbe709d52d965069c Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Wed, 7 Nov 2012 18:11:45 -0600 Subject: [PATCH] eris release + faster git cloning --- cgitrc | 6 ++--- g.cgi.c | 16 +++++++++++-- journal/2011-01.mdwn | 56 -------------------------------------------- journal/index.mdwn | 7 ------ journal/journal.mk | 1 - src/eris.mdwn | 4 ++-- 6 files changed, 19 insertions(+), 71 deletions(-) delete mode 100644 journal/2011-01.mdwn delete mode 100644 journal/index.mdwn delete mode 100644 journal/journal.mk diff --git a/cgitrc b/cgitrc index 88768d6..7b59d22 100644 --- a/cgitrc +++ b/cgitrc @@ -1,8 +1,8 @@ -project-list=/home/neale/projects/public.txt -#photobob pgircd py-pcap wticket gikiwiki unpluck firebot status py-ipqueue dbtl scoreboard eris +strict-export=git-daemon-export-ok snapshots=zip tar.gz -clone-url=http://woozle.org/~neale/projects/$CGIT_REPO_URL +clone-prefix=http://woozle.org/~neale/g.cgi +#clone-url=http://woozle.org/~neale/projects/$CGIT_REPO_URL scan-path=/home/neale/projects virtual-root=/~neale/g.cgi/ css=/~neale/cgit.css diff --git a/g.cgi.c b/g.cgi.c index b45ff54..7a1fff8 100644 --- a/g.cgi.c +++ b/g.cgi.c @@ -1,11 +1,23 @@ +#include #include #include +#define GIT_PROJECT_ROOT "/home/neale/projects" +#define CGIT_CONFIG "/home/neale/public_html/cgitrc" + int main(int argc, char *argv[]) { - setenv("CGIT_CONFIG", "/home/neale/public_html/cgitrc", 1); - execl("/usr/local/bin/cgit", "cgit", NULL); + char *uri = getenv("REQUEST_URI"); + + if (uri && strstr(uri, "git-upload-pack")) { + /* Use git-http-backend for great speed! */ + setenv("GIT_PROJECT_ROOT", GIT_PROJECT_ROOT, 1); + execlp("git", "git", "http-backend", NULL); + } else { + setenv("CGIT_CONFIG", CGIT_CONFIG, 1); + execl("/usr/local/bin/cgit", "cgit", NULL); + } return 0; } diff --git a/journal/2011-01.mdwn b/journal/2011-01.mdwn deleted file mode 100644 index bbfd3c1..0000000 --- a/journal/2011-01.mdwn +++ /dev/null @@ -1,56 +0,0 @@ -Title: Going Brown: January, 2011 - -January 8: Getting Started --------------------------- - -[Neale] After seeing a documentary called "No Impact Man" in December -last year, we made a new year's resolution to reduce how much trash we -make. We don't have a specific goal for volume, we just want to produce -as little trash as we can. - -First we had to okay this with our 5-year-old daughter. This wasn't too -hard, since every 6 months or so we pick up trash together in the vacant -lot across the street. She's acutely aware of not only how much trash -there is blowing around town, but also what sorts of things make up the -bulk of the trash: disposable plastics. She seemed to think it was a -reasonable thing to do, so off we go. - -After cataloging everything we threw away for a week, we determined that -our trash is largely food packaging. We are going to stop buying new -packaged food, instead running down our pantry until our new co-op -grocery store opens its doors in February. When the co-op opens, we'll -start buying as much as we can in bulk, and the things that we can't, -we'll try to buy in minimal packaging, with an eye toward compostable or -recyclable packaging. - -We rode our bikes today to the existing grocery store, to pick up some -pizza toppings. Our new "minimal packaging" goal actually saved us some -money on mushrooms: 1½ pounds of loose mushrooms in a plastic grocery -bag we brought with us came out to the same price as the 4-ounce -styrofoam container we normally bought. We also made friends with a -lady in the deli department when we asked if she could make thick slices -of mozarella and wrap it in wax paper. She did go through a pair of -disposable plastic gloves, though. - -When we got home, my toothbrush had arrived. I'm trying a [wooden -toothbrush](http://lifewithoutplastic.com/boutique/plasticfree-wooden-toothbrush-adult-p-400.html) -with bristles made of sterilized boar hairs. Amy and Ginnie are going -with a year-long [plastic toothbrush -subscription](http://www.preserveproducts.com/toothbrush-subscription.html): -every three months, the company mails out new toothbrushes made from -recycled food-grade plastics, and you mail back the old ones to be -recycled. Every time plastic is recycled, it degrades, but recycling is -better than throwing away, and our goal this year is to reduce our -trash. - -[Amy] We also did a fairly significant purge of toys, games, and -clothing recently from our closets. We have never been the type to -stand for clutter, but clutter is what was starting to build up. We -noticed that a significant amount of the plastic toys we purged from our -daughter's room were cheap plastic knick-knacks that were given to her -as party favors over the years. Our goal, therefore, is to simply take -less into our home. We would like to be a little more discerning in -what we bring through our front door, from clothing to toys to -electronics, etc. Basically, we'd like to pretend that we have a small -Seattle apartment again, and don't have a lot of room for impulse -purchases, or things we can't immediately find homes for. diff --git a/journal/index.mdwn b/journal/index.mdwn deleted file mode 100644 index ab7d3db..0000000 --- a/journal/index.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -Title: Journal --------------------- - - -June 27: We've evacuated our house and are staying with my parents. -News we're getting doesn't make it sound promising for the town. I'll -keep this page updated for those who care. \ No newline at end of file diff --git a/journal/journal.mk b/journal/journal.mk deleted file mode 100644 index b021b12..0000000 --- a/journal/journal.mk +++ /dev/null @@ -1 +0,0 @@ -PLAIN += journal diff --git a/src/eris.mdwn b/src/eris.mdwn index a0cbda6..32abffc 100644 --- a/src/eris.mdwn +++ b/src/eris.mdwn @@ -38,6 +38,6 @@ Differences with fnord Download -------- -* [3.0 Release Candidate 1](http://woozle.org/~neale/g.cgi/eris/snapshot/eris-3.0rc1.tar.gz) -* [Version Control](http://woozle.org/~neale/g.cgi/eris) +* [Version 3.1.2](http://woozle.org/~neale/g.cgi/eris/snapshot/eris-3.1.2.tar.gz) +* [Source Control](http://woozle.org/~neale/g.cgi/eris)