From a52ba84901d42708ef33116d9f5daaa531a0897a Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <bernie@codewiz.org>
Date: Sun, 30 Nov 2008 19:25:01 -0500
Subject: [PATCH] New pages from giskard

---
 EditPage               | 16 ++++++++++++++
 IncludeTest            |  4 ++++
 IncludedPage           |  1 +
 OneLaptopPerChild.orig | 48 ++++++++++++++++++++++++++++++++++++++++++
 OneLaptopPerChild.rej  | 19 +++++++++++++++++
 Pictures.rej           |  4 ++++
 post_edit_hook.sh      | 20 ++++++++++++++++++
 wiki_apache.conf       |  8 +++++++
 8 files changed, 120 insertions(+)
 create mode 100644 EditPage
 create mode 100644 IncludeTest
 create mode 100644 IncludedPage
 create mode 100644 OneLaptopPerChild.orig
 create mode 100644 OneLaptopPerChild.rej
 create mode 100644 Pictures.rej
 create mode 100644 post_edit_hook.sh
 create mode 100644 wiki_apache.conf

diff --git a/EditPage b/EditPage
new file mode 100644
index 0000000..d1e6994
--- /dev/null
+++ b/EditPage
@@ -0,0 +1,16 @@
+**Editing <<HttpGet|edit>> for <<RemoteUser>> from <<RemoteHost>>**
+<div class="editor">
+<form method="post" enctype="multipart/form-data" action="<<ThisUrl>>" >
+<input type="hidden" name="edit" value="<<HttpGet|edit>>">'
+<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100"><<HttpPost|savetext>></textarea>
+Or upload a file: <input type="file" name="file" value="<<HttpPost|file>>" />
+\\
+<input type="submit" name="save" value="Save" />
+<input type="submit" name="preview" value="Preview" />
+<input type="reset" value="Reset" />
+<input type="submit" name="cancel" value="Cancel" />
+\\
+</form></div>
+[[EditingTips]]
+
+<<HttpPost|savetext>>
diff --git a/IncludeTest b/IncludeTest
new file mode 100644
index 0000000..80882bf
--- /dev/null
+++ b/IncludeTest
@@ -0,0 +1,4 @@
+<<Include|AmigaForever>>
+<<Include|AmyResource>>
+<<Include|AmigaMagazine>>
+
diff --git a/IncludedPage b/IncludedPage
new file mode 100644
index 0000000..af5626b
--- /dev/null
+++ b/IncludedPage
@@ -0,0 +1 @@
+Hello, world!
diff --git a/OneLaptopPerChild.orig b/OneLaptopPerChild.orig
new file mode 100644
index 0000000..630b890
--- /dev/null
+++ b/OneLaptopPerChild.orig
@@ -0,0 +1,48 @@
+== Experimental packages ==
+
+ * xtest OS images: http://bender.codewiz.org/pub/olpc/streams/xtest/
+ * yum repository: http://www.codewiz.org/pub/olpc-bernie/
+
+== General Info ==
+
+ * Public website: http://www.laptop.org/
+ * Project wiki: http://wiki.laptop.org/
+ * Developer resources: http://dev.laptop.org/
+ * See the ExOh laptop in action!
+
+== My Work ==
+
+=== Ongoing ===
+
+ * Performance tuning (Xorg, cairo, initscripts...)
+ * Random kernel hacking: https://www.develer.com/gitweb/pub/users/bernie/olpc-2.6-master
+ * Maintaining changes to XKB keyboard definitions (xkeyboard-config)
+ * RPM packaging work: https://admin.fedoraproject.org/pkgdb/users/packages/bernie
+
+=== Specific tasks ===
+
+ * Competitive strategies against the TwoHundredDollarLaptop (TODO)
+ * Upgrading the OLPC bathrooms to BadVista (DONE)
+ * Porting Xorg 1.4 to the OLPC: XorgOlpcTasks (DONE)
+ * Porting Xorg 1.4.99 to the OLPC: http://www.codewiz.org/pub/olpc/xorg1499/
+ * Optimized glibc 2.7: http://www.codewiz.org/pub/olpc/glibc-geode-2.7/
+ * Localization: EthiopianLocale
+ * Sugarizing the XaoS activitiy: http://wiki.laptop.org/go/XaoS
+ * Sugarizing the Linux SoundTracker
+ * OneAmigaPerChild emulation pet project
+
+== My Bugs ==
+
+ * Assigned to me: http://dev.laptop.org/query?owner=bernie
+ * Reported by me: http://dev.laptop.org/query?reporter=bernie
+ * Commented by me: https://dev.laptop.org/query?cc=bernie
+
+[[http://www.laptopgiving.org/ | GiveOneGetOne.jpg]]
+
+----
+
+**Due to questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
+
+OneWindozePerChild.png
+
+Instead, I'm working on [[SugarLabs]]. 
diff --git a/OneLaptopPerChild.rej b/OneLaptopPerChild.rej
new file mode 100644
index 0000000..4191f90
--- /dev/null
+++ b/OneLaptopPerChild.rej
@@ -0,0 +1,19 @@
+***************
+*** 41,48 ****
+  
+  ----
+  
+- **Due to questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
+  
+- OneWindozePerChild.png
+  
+- Instead, I'm working on [[SugarLabs]].
+--- 41,48 ----
+  
+  ----
+  
++ **Due to unclear and questionable decisions made by our top-management, at this time I cannot fully endorse OLPC**
+  
++ {{OneWindozePerChild.png}}
+  
++ Instead, I'm working on the [[SugarLabs]] foundation.
diff --git a/Pictures.rej b/Pictures.rej
new file mode 100644
index 0000000..927e8dd
--- /dev/null
+++ b/Pictures.rej
@@ -0,0 +1,4 @@
+***************
+*** 0 ****
+--- 1 ----
++ ../../../Pictures
\ No newline at end of file
diff --git a/post_edit_hook.sh b/post_edit_hook.sh
new file mode 100644
index 0000000..d12d0a7
--- /dev/null
+++ b/post_edit_hook.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Die easily and make sure the cgi collects stderr too
+set -e
+exec 2>&1
+
+if [ $# -ne 3 ]; then
+	echo "Usage $0 <path-to-commit> <remote-user> <remote-host>"
+	exit 1
+fi
+
+repo=`dirname "$1"`
+file=`basename "$1"`
+
+cd $repo
+git-add $file # In case it's a new page
+
+GIT_COMMITTER_NAME='Piki Plus' \
+GIT_COMMITTER_EMAIL='webmaster@codewiz.org' \
+git-commit -a -m "Edit page $file" --author="$2 <$2@$3>"
diff --git a/wiki_apache.conf b/wiki_apache.conf
new file mode 100644
index 0000000..0666594
--- /dev/null
+++ b/wiki_apache.conf
@@ -0,0 +1,8 @@
+# Where the wiki should appear
+ScriptAlias /wiki /home/bernie/public_html/wiki/pikiplus.py
+
+# Path to gitweb scriopt to browse the wiki
+ScriptAlias /wikigit /home/bernie/public_html/wiki/gitweb.cgi
+
+# Data files (optional)
+Alias /wikidata /home/bernie/public_html/wiki
-- 
2.25.1