Merge branch 'master' of braunbox:~hurd-web/hurd-web

4 files changed, 13 insertions, 18 deletions

diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index 98ced949..f2c35e2f 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -1,5 +1,5 @@
 [[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-2015 Free Software Foundation, Inc."]]
+2015, 2016 Free Software Foundation, Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
 id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -13,6 +13,8 @@ License|/fdl]]."]]"""]]
 
 # Upcoming
 
+  * [[FOSDEM_2016]]
+
 
 # Past
 
diff --git a/community/meetings/fosdem_2016.mdwn b/community/meetings/fosdem_2016.mdwn
index 507ec30d..f175af09 100644
--- a/community/meetings/fosdem_2016.mdwn
+++ b/community/meetings/fosdem_2016.mdwn
@@ -22,6 +22,7 @@ Bruxelles.
 [[!table class="table_style_1" data="""
 "Name","Attending","Arrival","Return"
 "Samuel Thibault","yes","Saturday, 09:17 BRU","Sunday, 19:13 BRU"
+"[[Thomas Schwinge|tschwinge]]","yes","Friday, 17:35, Bruxelles Midi","Sunday, 18:25, Bruxelles Midi"
 """]]
 
 
diff --git a/ikiwiki.setup b/ikiwiki.setup
index cfb3e646..0f912b82 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -51,7 +51,7 @@ IkiWiki::Setup::Standard->import({
 	# base url to the wiki
 	url => 'http://darnassus.sceen.net/~hurd-web',
 	# url to the ikiwiki.cgi
-	cgiurl => 'http://darnassus.sceen.net/cgi-bin/hurd-web',
+	cgiurl => 'http://darnassus.sceen.net/hurd-web.cgi',
 	# filename of cgi wrapper to generate
 	cgi_wrapper => $cgi_wrapper,
 	# mode for cgi_wrapper (can safely be made suid)
@@ -211,7 +211,10 @@ IkiWiki::Setup::Standard->import({
 	# url pattern of openid realm (default is cgiurl)
 	#openid_realm => '',
 	# url to ikiwiki cgi to use for openid authentication (default is cgiurl)
-	#openid_cgiurl => '',
+	# TODO.  I don't know why I have to set this -- it's supposed to be the
+	# default -- but if this is not set, the OpenID provider redirects us
+	# to <http://darnassus.sceen.net/>, which doesn't work.
+	openid_cgiurl => 'http://darnassus.sceen.net/hurd-web.cgi',
 
 	# passwordauth plugin
 	# a password that must be entered when signing up for an account
diff --git a/public_hurd_boxen/installation/darnassus.mdwn b/public_hurd_boxen/installation/darnassus.mdwn
index 4a86f609..620baa0a 100644
--- a/public_hurd_boxen/installation/darnassus.mdwn
+++ b/public_hurd_boxen/installation/darnassus.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2013, 2014, 2015 Free Software Foundation,
+[[!meta copyright="Copyright © 2013, 2014, 2015, 2016 Free Software Foundation,
 Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
@@ -14,9 +14,10 @@ License|/fdl]]."]]"""]]
 
 # Packages
 
-  * apache2
+  * sthttpd (thttpd)
 
     Installation done by Richard.
+    [[!message-id "20151122000109.GA8492@shattrath"]].
 
   * ikiwiki
 
@@ -92,7 +93,7 @@ May want to clean up `~hurd-web/public_html.workspace/.ikiwiki/` before that.
 
 As a user with appropriate permissions, then install the CGI file:
 
-    $ sudo mv ~hurd-web/public_html.workspace.cgi /usr/lib/cgi-bin/hurd-web
+    § sudo mv ~hurd-web/public_html.workspace.cgi /var/www/html/hurd-web.cgi
 
 
 # `~tschwinge/`
@@ -122,15 +123,6 @@ The goal is that robots rather index the official pages,
 <http://darnassus.sceen.net/~hurd-web/>.
 
 
-# Restore Backup
-
-/!\ TODO.
-
-## `/etc/apache2/mods-enabled/`
-
-`rewrite.load`, `userdir.conf`, `userdir.load`
-
-
 # IRC, freenode, #hurd, 2013-02-09
 
     <tschwinge> We need an httpd (Apache used to work), and ikiwiki and some
@@ -160,9 +152,6 @@ The goal is that robots rather index the official pages,
     <tschwinge> OK, I again understand the setup.  Last been touched in the
       2008/2009 timeframe.  ;-)
 
-    <braunr> so you finished your pat i suppose
-    <braunr> i'll install apache
-    <braunr> part*
     <tschwinge> I'll add a hurd-web user.
     <tschwinge> So...  I actually have to locate a backup of the files from
       flubber related to the wiki,