public_hurd_boxen/*: Reorganize a bit.

6 files changed, 125 insertions, 97 deletions

diff --git a/public_hurd_boxen.mdwn b/public_hurd_boxen.mdwn
index 33d50f8f..3bf8e85c 100644
--- a/public_hurd_boxen.mdwn
+++ b/public_hurd_boxen.mdwn
@@ -15,7 +15,7 @@ Here are some Hurd boxes that users have made available to the public:
 "Hoster","Name","Distribution","Machine Specs","Comments"
 "[[bddebian]]","blubber","Debian GNU/Hurd","Celeron 2.2 GHz; 222 MiB","Xen domU on [[zenhost]]; for experimental stuff"
 "[[bddebian]]","clubber","Debian GNU/Hurd","PIII 1 GHz; 384 MiB"
-"[[bddebian]]","[[flubber]]","Debian GNU/Hurd","Celeron 2.2 GHz; 666 MiB","Xen domU on [[zenhost]]"
+"[[bddebian]]","flubber","Debian GNU/Hurd","Celeron 2.2 GHz; 666 MiB","Xen domU on [[zenhost]]"
 "[[bddebian]]","snubber","Debian GNU/Hurd","Celeron 2.2 GHz; 160 MiB","Xen domU on [[zenhost]]; web server"
 "[[bddebian]]","gnubber","Debian GNU/Hurd","PII 733 MHz; 384 MiB"
 "[[bddebian]]","goober","Debian GNU/Hurd","?"
diff --git a/public_hurd_boxen/bddebian.mdwn b/public_hurd_boxen/bddebian.mdwn
index dfbd64e9..82fb0b8c 100644
--- a/public_hurd_boxen/bddebian.mdwn
+++ b/public_hurd_boxen/bddebian.mdwn
@@ -12,7 +12,7 @@ License|/fdl]]."]]"""]]
 
   * [[zenhost]]: 192.168.10.60
       * blubber: 192.168.10.61
-      * [[flubber]]: 192.168.10.50
+      * flubber: 192.168.10.50
       * grubber: 192.168.10.63
       * snubber: 192.168.10.62
 
diff --git a/public_hurd_boxen/installation.mdwn b/public_hurd_boxen/installation.mdwn
new file mode 100644
index 00000000..39db4717
--- /dev/null
+++ b/public_hurd_boxen/installation.mdwn
@@ -0,0 +1,89 @@
+[[!meta copyright="Copyright © 2009, 2010 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
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+This page documents how installation of a new machine is being done on
+[[zenhost]].
+
+  * Enable loggin with screen (`C-a H`).
+
+  * \# lvcreate ...
+
+  * ~tschwinge/machines/[MACHINE]
+
+  * \# MACHINE=[MACHINE] TARGET=/dev/zenhost/[MACHINE]-root ~tschwinge/install_crosshurd
+
+      * TODO
+
+            I: Extracting /var/cache/apt/archives/dash_0.5.5.1-3_hurd-i386.deb...
+            tar: ./bin/sh: Cannot create symlink to `dash': File exists
+            tar: ./usr/share/man/man1/sh.1.gz: Cannot create symlink to `dash.1.gz': File exists
+            tar: Exiting with failure status due to previous errors
+
+        Ignore?  --
+        <http://lists.gnu.org/archive/html/bug-hurd/2009-11/msg00094.html>
+
+  * \# sudo umount /tmp/crosshurd.[MACHINE]  
+    \# sudo rmdir /tmp/crosshurd.[MACHINE]
+
+  * /etc/xen/[MACHINE]
+
+  * \# xm create -c [MACHINE]
+
+      * \# /install
+
+          * TODO
+
+                Unpacking debconf (from .../debconf_1.5.28_all.deb) ...
+                + debconf-set-selections
+                warning: Unknown type error, skipping line 9
+
+          * TODO
+
+                +---------------------------Configuring grub-pc------------------------------+
+
+            Make it not install GRUB packages.
+
+            Likewise, the *gnumach* package need not be installed.
+
+      * If needed:
+
+        \# cd /dev/ && ./MAKEDEV hd2  
+        \# mkfs.ext2 -I 128 -b 4096 /dev/hd2 # TAKE CARE!  
+        \# mkdir /media/data && settrans /media/data /hurd/ext2fs /dev/hd2  
+        \# rmdir /home && ln -s media/data/home /  
+        \# mkdir /media/data/home
+
+      * If needed: restore (parts of) some files
+
+          * /etc/fstab
+
+          * /etc/{passwd,shadow,group,gshadow}
+
+              * \# adduser ... sudo
+
+              * \# passwd root
+
+          * /etc/ssh/ssh_host_*key*
+
+            Can do this here or have to move after install_packages due to the
+            files being overwritten again (don't think so)?
+
+      * \# syncfs -s && halt
+
+  * \# xm create -c [MACHINE]
+
+      * \# /install_packages
+
+  * add line to zenhost's `/etc/hosts`
+
+  * system-specific:
+
+      * [[flubber]]
+      * [[snubber]]
diff --git a/public_hurd_boxen/flubber.mdwn b/public_hurd_boxen/installation/flubber.mdwn
index 219c2db9..219c2db9 100644
--- a/public_hurd_boxen/flubber.mdwn
+++ b/public_hurd_boxen/installation/flubber.mdwn
diff --git a/public_hurd_boxen/installation/snubber.mdwn b/public_hurd_boxen/installation/snubber.mdwn
new file mode 100644
index 00000000..703169a8
--- /dev/null
+++ b/public_hurd_boxen/installation/snubber.mdwn
@@ -0,0 +1,33 @@
+[[!meta copyright="Copyright © 2010 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
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+# Additional Packages
+
+    apache2-mpm-worker build-essential git-core gitweb ikiwiki inetutils-inetd
+    less libtext-csv-perl netcat nullmailer perlmagick screen texinfo
+
+    $ find /etc/rc*/ | grep syslog | sudo xargs rm
+
+
+# `~hurd-web/`
+
+    $ mkdir hurd-web && GIT_DIR=hurd-web git init
+
+
+# `~tschwinge/`
+
+    $ mkdir tmp/backup && chmod 0733 tmp/backup
+
+
+# Restore Backup
+
+## `/etc/apache2/mods-enabled/`
+
+`rewrite.load`, `userdir.conf`, `userdir.load`
diff --git a/public_hurd_boxen/zenhost.mdwn b/public_hurd_boxen/zenhost.mdwn
index 812b9ef2..b828b8e9 100644
--- a/public_hurd_boxen/zenhost.mdwn
+++ b/public_hurd_boxen/zenhost.mdwn
@@ -15,98 +15,4 @@ License|/fdl]]."]]"""]]
 [[!inline pages=public_hurd_boxen/xen_handling feeds=no]]
 
 
-# Installing a New Machine
-
-  * Enable loggin with screen (`C-a H`).
-
-  * \# lvcreate ...
-
-  * ~tschwinge/machines/[MACHINE]
-
-  * \# MACHINE=[MACHINE] TARGET=/dev/zenhost/[MACHINE]-root ~tschwinge/install_crosshurd
-
-      * TODO
-
-            I: Extracting /var/cache/apt/archives/dash_0.5.5.1-3_hurd-i386.deb...
-            tar: ./bin/sh: Cannot create symlink to `dash': File exists
-            tar: ./usr/share/man/man1/sh.1.gz: Cannot create symlink to `dash.1.gz': File exists
-            tar: Exiting with failure status due to previous errors
-
-        Ignore?  --
-        <http://lists.gnu.org/archive/html/bug-hurd/2009-11/msg00094.html>
-
-  * \# sudo umount /tmp/crosshurd.[MACHINE]  
-    \# sudo rmdir /tmp/crosshurd.[MACHINE]
-
-  * /etc/xen/[MACHINE]
-
-  * \# xm create -c [MACHINE]
-
-      * \# /install
-
-          * TODO
-
-                Unpacking debconf (from .../debconf_1.5.28_all.deb) ...
-                + debconf-set-selections
-                warning: Unknown type error, skipping line 9
-
-          * TODO
-
-                +---------------------------Configuring grub-pc------------------------------+
-
-            Make it not install GRUB packages.
-
-            Likewise, the *gnumach* package need not be installed.
-
-      * If needed:
-
-        \# cd /dev/ && ./MAKEDEV hd2  
-        \# mkfs.ext2 -I 128 -b 4096 /dev/hd2 # TAKE CARE!  
-        \# mkdir /media/data && settrans /media/data /hurd/ext2fs /dev/hd2  
-        \# rmdir /home && ln -s media/data/home /  
-        \# mkdir /media/data/home
-
-      * If needed: restore (parts of) some files
-
-          * /etc/fstab
-
-          * /etc/{passwd,shadow,group,gshadow}
-
-              * \# adduser ... sudo
-
-              * \# passwd root
-
-          * /etc/ssh/ssh_host_*key*
-
-            Can do this here or have to move after install_packages due to the
-            files being overwritten again (don't think so)?
-
-      * \# syncfs -s && halt
-
-  * \# xm create -c [MACHINE]
-
-      * \# /install_packages
-
-  * add line to zenhost's `/etc/hosts`
-
-
-# snubber
-
-  * apache2-mpm-worker build-essential git-core gitweb ikiwiki inetutils-inetd
-    less libtext-csv-perl netcat nullmailer perlmagick screen texinfo
-
-      * `find /etc/rc*/ | grep syslog | sudo xargs rm`
-
-  * `~hurd-web/`
-
-      * `mkdir hurd-web && GIT_DIR=hurd-web git init`
-
-  * `~tschwinge/`
-
-      * `mkdir tmp/backup && chmod 0733 tmp/backup`
-
-  * restore backup
-
-      * `/etc/apache2/mods-enabled/`
-
-          * `rewrite.load`, `userdir.conf`, `userdir.load`
+# [[Installation of new machines|installation]]