better-organized colophon/oddmuse

7 files changed, 80 insertions, 90 deletions

diff --git a/colophon.md b/colophon.md
index b4bbc0f8..88b52c00 100644
--- a/colophon.md
+++ b/colophon.md
@@ -12,19 +12,14 @@ the [[instructions on how to edit the wiki|editing]].
 The EmacsConf site during 2019 was built on the awesome
 [Oddmuse](//oddmuse.org) wiki software, available under GPLv3+.
 
-It used a number of [extensions](//oddmuse.org/wiki/Module) to add
-additional useful features.  Most notably, we used the
-[Namespaces](//oddmuse.org/wiki/Namespaces_Extension) module to allow
-creation of what are in effect sub-wikis for each conference year.
-
-You can see the list of extensions we used to use, along with their
-versions, at [[oddmuse-version]]; and a copy of the latest config file
-we used along with other related files at [[oddmuse-config]].
-
 As nice as Oddmuse is, we found the lack of proper nested pages rather
 limiting for our use-case, and have since switched to using ikiwiki
 for this wiki.
 
+Feel free to check out [[oddmuse]] for more information about our old
+Oddmuse setup, including the latest Oddmuse config file we used, along
+with other related files.
+
 ## Discourse
 
 For EmacsConf 2015 we started self-hosting a Discourse instance at
diff --git a/colophon/oddmuse.md b/colophon/oddmuse.md
new file mode 100644
index 00000000..8b719fc3
--- /dev/null
+++ b/colophon/oddmuse.md
@@ -0,0 +1,14 @@
+Our Oddmuse setup used a number of
+[extensions](//oddmuse.org/wiki/Module) to add additional useful
+features.  Most notably, we used the
+[Namespaces](//oddmuse.org/wiki/Namespaces_Extension) module to allow
+creation of what are in effect sub-wikis for each conference year.
+
+Here's more information about our old Oddmuse setup, along with the
+various configuration files we used to use:
+
+- [[Oddmuse extensions and their versions|oddmuse/version]]
+- [[oddmuse/config]] file
+- [[oddmuse/server.conf]]
+- [[oddmuse/server.pl]]
+- [[oddmuse/omecp.pl]]
diff --git a/colophon/oddmuse-config.md b/colophon/oddmuse/config
index 802358ad..7ff1d54b 100644
--- a/colophon/oddmuse-config.md
+++ b/colophon/oddmuse/config
@@ -1,6 +1,3 @@
-## config
-
-<pre><code class="perl">
 # -*- mode: perl -*-
 use utf8; # this file contains utf8 strings.
 do "$ENV{OMHOME}/omecp.pl";
@@ -152,81 +149,3 @@ sub VidLinkRule{
   }
   return;
 }
-</code></pre>
-
-## server.conf
-
-```conf
-{
-  hypnotoad => {
-    listen  => ['http://127.0.0.1:11937'],
-    workers => 10
-  }
-};
-```
-
-## server.pl
-
-```perl
-#!/usr/bin/env perl
-
-# Copyright (C) 2015-2016  Alex Schroeder <alex@gnu.org>
-
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, either version 3 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program. If not, see <http://www.gnu.org/licenses/>.
-
-use Mojolicious::Lite;
-
-# This needs to be in a different section, sometimes?
-plugin CGI => {
-  support_semicolon_in_query_string => 1,
-};
-
-plugin CGI => {
-  # route => '/wiki',
-  route => '/',
-  # We need this for older versions of Mojolicious::Plugin::CGI
-  script => 'wiki.pl',
-  run => \&OddMuse::DoWikiRequest,
-  before => sub {
-    no warnings;
-    $OddMuse::RunCGI = 0;
-    # The default data directory is determined by the environment variable
-    # WikiDataDir and falls back to the following
-    # $OddMuse::DataDir = '/tmp/oddmuse';
-    use warnings;
-    require './build/wiki.pl' unless defined &OddMuse::DoWikiRequest;
-  },
-  env => {
-    "OMHOME" => "/home/omec"
-  },
-  # path to where STDERR from cgi script goes
-  errlog => ($ENV{WikiDataDir} || '/tmp/oddmuse')
-      . "/wiki.log",
-};
-
-#plugin SetUserGroup => {user => "omec", group => "omec"};
-
-#get '/' => sub {
-#  my $self = shift;
-#  $self->redirect_to('/wiki');
-#};
-
-app->plugin('Config');
-app->start;
-```
-
-## ~/omecp.pl
-
-```perl
-$AdminPass = 'redacted';
-```
diff --git a/colophon/oddmuse/omecp.pl b/colophon/oddmuse/omecp.pl
new file mode 100644
index 00000000..c7440144
--- /dev/null
+++ b/colophon/oddmuse/omecp.pl
@@ -0,0 +1 @@
+$AdminPass = 'redacted';
diff --git a/colophon/oddmuse/server.conf b/colophon/oddmuse/server.conf
new file mode 100644
index 00000000..6d10a9d4
--- /dev/null
+++ b/colophon/oddmuse/server.conf
@@ -0,0 +1,6 @@
+{
+  hypnotoad => {
+    listen  => ['http://127.0.0.1:11937'],
+    workers => 10
+  }
+};
diff --git a/colophon/oddmuse/server.pl b/colophon/oddmuse/server.pl
new file mode 100644
index 00000000..8f117219
--- /dev/null
+++ b/colophon/oddmuse/server.pl
@@ -0,0 +1,55 @@
+#!/usr/bin/env perl
+
+# Copyright (C) 2015-2016  Alex Schroeder <alex@gnu.org>
+
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+use Mojolicious::Lite;
+
+# This needs to be in a different section, sometimes?
+plugin CGI => {
+  support_semicolon_in_query_string => 1,
+};
+
+plugin CGI => {
+  # route => '/wiki',
+  route => '/',
+  # We need this for older versions of Mojolicious::Plugin::CGI
+  script => 'wiki.pl',
+  run => \&OddMuse::DoWikiRequest,
+  before => sub {
+    no warnings;
+    $OddMuse::RunCGI = 0;
+    # The default data directory is determined by the environment variable
+    # WikiDataDir and falls back to the following
+    # $OddMuse::DataDir = '/tmp/oddmuse';
+    use warnings;
+    require './build/wiki.pl' unless defined &OddMuse::DoWikiRequest;
+  },
+  env => {
+    "OMHOME" => "/home/omec"
+  },
+  # path to where STDERR from cgi script goes
+  errlog => ($ENV{WikiDataDir} || '/tmp/oddmuse')
+      . "/wiki.log",
+};
+
+#plugin SetUserGroup => {user => "omec", group => "omec"};
+
+#get '/' => sub {
+#  my $self = shift;
+#  $self->redirect_to('/wiki');
+#};
+
+app->plugin('Config');
+app->start;
diff --git a/colophon/oddmuse-version.md b/colophon/oddmuse/version.md
index 35148145..35148145 100644
--- a/colophon/oddmuse-version.md
+++ b/colophon/oddmuse/version.md