summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ikiwiki.setup7
-rw-r--r--public_hurd_boxen/installation/darnassus.mdwn19
2 files changed, 9 insertions, 17 deletions
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,