From 785967ca4d107418807735c60fc463d729773a4d Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Wed, 15 Aug 2012 17:30:23 -0600 Subject: [PATCH] Website document reorganization * Three new categories: blog, misc, and projects * Move documents to their new proper locations * Add a blog entry about read-only root and bind mounting /var * Update copyright year in footer Blogs, being in a separate source directory structure, needs its own images/ subdir due to relative paths for images. This behavior is good, since it makes sense to separate blog images from main site images. --- in/aptrepo.md | 1 + in/blog.md | 8 ++++++++ in/blog/2011-07.md | 5 +++++ in/blog/2011-10.md | 5 +++++ in/blog/2011.md | 5 +++++ in/blog/2012-08.md | 5 +++++ in/blog/2012.md | 5 +++++ in/{ => blog}/images/wwvb-capture.png | Bin in/{ => blog}/ro-root.md | 14 ++++++++----- in/{ => blog}/virtual-win7.md | 3 ++- in/{ => blog}/wwvb.md | 3 ++- in/gitweb/githeader.md | 1 + in/index.md | 1 + in/misc.md | 8 ++++++++ in/{ => misc}/firmware.md | 3 ++- in/misc/msp430.md | 26 ++++++++++++++++++++++++ in/misc/oss-web.md | 10 +++++++++ in/{ => misc}/webber.md | 3 ++- in/msp430.md | 24 ---------------------- in/news.md | 7 ++++--- in/oss-web.md | 8 -------- in/projects.md | 8 ++++++++ in/{ => projects}/cp210x.md | 3 ++- in/{ => projects}/git-utils.md | 3 ++- in/{ => projects}/ovzbpc.md | 3 ++- in/{ => projects}/rgblamp.md | 5 +++-- in/{ => projects}/rgblamp/code.md | 3 ++- in/{ => projects}/rgblamp/features.md | 3 ++- in/{ => projects}/rgblamp/leds.md | 3 ++- in/{ => projects}/rgblamp/mechanical.md | 3 ++- in/{ => projects}/rgblamp/random.md | 3 ++- in/{ => projects}/rgblamp/task.md | 3 ++- in/{ => projects}/rgblamp/timer.md | 3 ++- in/{ => projects}/tinyos.md | 3 ++- in/{ => projects}/tmicore.md | 3 ++- in/style/default.tmpl | 4 ++-- in/tinyospkgs.md | 1 + 37 files changed, 139 insertions(+), 60 deletions(-) create mode 100644 in/blog.md create mode 100644 in/blog/2011-07.md create mode 100644 in/blog/2011-10.md create mode 100644 in/blog/2011.md create mode 100644 in/blog/2012-08.md create mode 100644 in/blog/2012.md rename in/{ => blog}/images/wwvb-capture.png (100%) rename in/{ => blog}/ro-root.md (92%) rename in/{ => blog}/virtual-win7.md (99%) rename in/{ => blog}/wwvb.md (99%) create mode 100644 in/misc.md rename in/{ => misc}/firmware.md (95%) create mode 100644 in/misc/msp430.md create mode 100644 in/misc/oss-web.md rename in/{ => misc}/webber.md (93%) delete mode 100644 in/msp430.md delete mode 100644 in/oss-web.md create mode 100644 in/projects.md rename in/{ => projects}/cp210x.md (98%) rename in/{ => projects}/git-utils.md (98%) rename in/{ => projects}/ovzbpc.md (97%) rename in/{ => projects}/rgblamp.md (93%) rename in/{ => projects}/rgblamp/code.md (96%) rename in/{ => projects}/rgblamp/features.md (97%) rename in/{ => projects}/rgblamp/leds.md (98%) rename in/{ => projects}/rgblamp/mechanical.md (98%) rename in/{ => projects}/rgblamp/random.md (96%) rename in/{ => projects}/rgblamp/task.md (98%) rename in/{ => projects}/rgblamp/timer.md (98%) rename in/{ => projects}/tinyos.md (98%) rename in/{ => projects}/tmicore.md (96%) diff --git a/in/aptrepo.md b/in/aptrepo.md index 9e6302d..a518168 100644 --- a/in/aptrepo.md +++ b/in/aptrepo.md @@ -2,6 +2,7 @@ title: APT Repository linktitle: aptrepo parent: Home ctime: 2009-12-10 +mtime: 2012-08-01 Repositories: [[aptrepo]]. diff --git a/in/blog.md b/in/blog.md new file mode 100644 index 0000000..762dfe4 --- /dev/null +++ b/in/blog.md @@ -0,0 +1,8 @@ +title: Blog +linktitle: blog +parent: Home +ctime: 2012-08-15 +mtime: 2000-01-01 + +This category contains various articles blogged by TMI staff. Please select +from the side menu on the left. diff --git a/in/blog/2011-07.md b/in/blog/2011-07.md new file mode 100644 index 0000000..43c02b3 --- /dev/null +++ b/in/blog/2011-07.md @@ -0,0 +1,5 @@ +title: 2011-07 blogs +linktitle: 2011-07 +parent: 2011 +ctime: 2011-07-01 +mtime: 2000-01-01 diff --git a/in/blog/2011-10.md b/in/blog/2011-10.md new file mode 100644 index 0000000..beef513 --- /dev/null +++ b/in/blog/2011-10.md @@ -0,0 +1,5 @@ +title: 2011-10 blogs +linktitle: 2011-10 +parent: 2011 +ctime: 2011-10-01 +mtime: 2000-01-01 diff --git a/in/blog/2011.md b/in/blog/2011.md new file mode 100644 index 0000000..e4b06aa --- /dev/null +++ b/in/blog/2011.md @@ -0,0 +1,5 @@ +title: 2011 blogs +linktitle: 2011 +parent: blog +ctime: 2011-01-01 +mtime: 2000-01-01 diff --git a/in/blog/2012-08.md b/in/blog/2012-08.md new file mode 100644 index 0000000..0380705 --- /dev/null +++ b/in/blog/2012-08.md @@ -0,0 +1,5 @@ +title: 2012-08 blogs +linktitle: 2012-08 +parent: 2012 +ctime: 2012-08-01 +mtime: 2000-01-01 diff --git a/in/blog/2012.md b/in/blog/2012.md new file mode 100644 index 0000000..738d6af --- /dev/null +++ b/in/blog/2012.md @@ -0,0 +1,5 @@ +title: 2012 blogs +linktitle: 2012 +parent: blog +ctime: 2012-01-01 +mtime: 2000-01-01 diff --git a/in/images/wwvb-capture.png b/in/blog/images/wwvb-capture.png similarity index 100% rename from in/images/wwvb-capture.png rename to in/blog/images/wwvb-capture.png diff --git a/in/ro-root.md b/in/blog/ro-root.md similarity index 92% rename from in/ro-root.md rename to in/blog/ro-root.md index 21a0a31..8fb5e09 100644 --- a/in/ro-root.md +++ b/in/blog/ro-root.md @@ -1,12 +1,14 @@ title: Read Only Root linktitle: ro-root -parent: Home +parent: 2012-08 ctime: 2012-08-02 +mtime: 2012-08-02 -For GNU/Linux desktop installations, I prefer to have the root filesystem, -which mounts to /, be mostly read-only. This means that /home, /var and /tmp -need to be mounted elsewhere. The benefits of this approach are several, but -two in particular stand out for desktop use cases. +For GNU/Linux desktop installations, I prefer to have the root filesystem, which +mounts to /, be mostly read-only. This means /home (user data), /var (variable +data) and /tmp (temporary data) should be mounted elsewhere. The benefits of +this approach are several, but two in particular stand out for desktop use +cases. * It is much easier to do a clean install the OS. User data in /home, and in some cases application data in /var, need not be backed up and restored @@ -27,6 +29,8 @@ them fills up. A common solution is to use LVM. Volumes are given minimal practical sizes, and then incrementally grown as required. LVM works fine on the desktop, but requires a bit more knowledge and effort to administer. +[[!pquote text="A simpler solution is to use bind mounts"]] + A simpler solution is to use bind mounts. By bind mounting /var from /home/var and /tmp from /home/tmp, all user, variable and temporary data are on a single partition. The root partition will be nearly static in content and size. I diff --git a/in/virtual-win7.md b/in/blog/virtual-win7.md similarity index 99% rename from in/virtual-win7.md rename to in/blog/virtual-win7.md index 691ff95..77b5603 100644 --- a/in/virtual-win7.md +++ b/in/blog/virtual-win7.md @@ -1,7 +1,8 @@ title: Virtual Windows 7 linktitle: virtual-win7 -parent: Home +parent: 2011-07 ctime: 2011-07-28 +mtime: 2011-07-28 # Introduction diff --git a/in/wwvb.md b/in/blog/wwvb.md similarity index 99% rename from in/wwvb.md rename to in/blog/wwvb.md index af10e2b..c03be9f 100644 --- a/in/wwvb.md +++ b/in/blog/wwvb.md @@ -1,7 +1,8 @@ title: WWVB linktitle: wwvb -parent: Home +parent: 2011-10 ctime: 2011-10-28 +mtime: 2011-10-28 Repositories: SOON diff --git a/in/gitweb/githeader.md b/in/gitweb/githeader.md index 83833ae..390b92d 100644 --- a/in/gitweb/githeader.md +++ b/in/gitweb/githeader.md @@ -1,3 +1,4 @@ title: OSS Repository template: bodyheader ctime: 2009-12-17 +mtime: 2000-01-01 diff --git a/in/index.md b/in/index.md index 4327f7c..79db1dd 100644 --- a/in/index.md +++ b/in/index.md @@ -1,6 +1,7 @@ title: OSS Projects linktitle: Home ctime: 2009-12-15 +mtime: 2000-01-01 # Introduction diff --git a/in/misc.md b/in/misc.md new file mode 100644 index 0000000..085c8a8 --- /dev/null +++ b/in/misc.md @@ -0,0 +1,8 @@ +title: Misc +linktitle: misc +parent: Home +ctime: 2012-08-15 +mtime: 2000-01-01 + +This category contains miscellaneous items of possible interest. Please select +from the side menu on the left. diff --git a/in/firmware.md b/in/misc/firmware.md similarity index 95% rename from in/firmware.md rename to in/misc/firmware.md index a4b9d32..011fe5a 100644 --- a/in/firmware.md +++ b/in/misc/firmware.md @@ -1,7 +1,8 @@ title: Router Firmware linktitle: firmware -parent: Home +parent: misc ctime: 2006-02-13 +mtime: 2006-02-13 Tarball: [gpl](http://www.titaniummirror.com/gpl). diff --git a/in/misc/msp430.md b/in/misc/msp430.md new file mode 100644 index 0000000..5340968 --- /dev/null +++ b/in/misc/msp430.md @@ -0,0 +1,26 @@ +title: MSP430 +linktitle: msp430 +parent: misc +ctime: 2008-01-03 +mtime: 2012-07-01 + +*This project is obsolete*. As of the release of Ubuntu 12.04 Precise Pangolin, +an up-to-date version of the MSP430 cross toolchain is available in the standard +repositories. For this reason, TMI is no longer maintaining its own MSP430 +toolchain, which ultimately use the same upstream source as the new standard +packages do. See the [[TMI Repository|aptrepo]] page for more information. + +As of 2012-08-15, the msp430-gdb package does not install due to a file +conflict as shown below. + + dpkg: error processing + /var/cache/apt/archives/gdb-msp430_7.2~mspgcc-7.2-20110612-1ubuntu1_i386.deb + (--unpack): + trying to overwrite '/usr/share/gdb/python/gdb/__init__.py', which is also + in package gdb 7.4-2012.04-0ubuntu2 + +Repositories: +[msp430-binutils](/gitweb/?p=msp430-binutils.git;a=summary), +[msp430-gcc](/gitweb/?p=msp430-gcc.git;a=summary), +[msp430-libc](/gitweb/?p=msp430-libc.git;a=summary), +[[aptrepo]]. diff --git a/in/misc/oss-web.md b/in/misc/oss-web.md new file mode 100644 index 0000000..6cf3a63 --- /dev/null +++ b/in/misc/oss-web.md @@ -0,0 +1,10 @@ +title: OSS Website Code +linktitle: oss-web +parent: misc +ctime: 2009-12-15 +mtime: 2009-12-15 + +Repositories: [oss-web](/gitweb/?p=oss-web.git;a=summary). + +The website you are viewing now is statically generated from the +[oss-web](/gitweb/?p=oss-web.git;a=summary). repository using [[Webber]]. diff --git a/in/webber.md b/in/misc/webber.md similarity index 93% rename from in/webber.md rename to in/misc/webber.md index 943de46..d71998c 100644 --- a/in/webber.md +++ b/in/misc/webber.md @@ -1,7 +1,8 @@ title: Webber linktitle: webber -parent: Home +parent: misc ctime: 2009-12-15 +mtime: 2009-12-15 Repositories: [webber](/gitweb/?p=webber.git;a=summary). diff --git a/in/msp430.md b/in/msp430.md deleted file mode 100644 index 451407d..0000000 --- a/in/msp430.md +++ /dev/null @@ -1,24 +0,0 @@ -title: MSP430 -linktitle: msp430 -parent: Home -ctime: 2008-01-03 - -Repositories: -[msp430-binutils](/gitweb/?p=msp430-binutils.git;a=summary), -[msp430-gcc](/gitweb/?p=msp430-gcc.git;a=summary), -[msp430-libc](/gitweb/?p=msp430-libc.git;a=summary), -[[aptrepo]]. - -TMI maintains an msp430 toolchain, including [[Ubuntu packages|aptrepo]], which -works with newer members of the msp430 family including the popular MSP430F2x1x -parts such as the MSP430F2618. This toolchain is properly patched for use in -[[TinyOS]] development. - -As of the release of Ubuntu 12.04 Precise Pangolin, an up-to-date version of the -MSP430 cross toolchain is available in the standard repositories. For this -reason, TMI is no longer maintaining its own packages, which ultimately use the -same upstream source as the new standard packages do. See the [[TMI -Repository|aptrepo]] page for more information. - -As of 2012-06-15, the msp430-gdb package does not install due to a file -conflict. This will likely be fixed soon. diff --git a/in/news.md b/in/news.md index 51b8345..93249f8 100644 --- a/in/news.md +++ b/in/news.md @@ -1,9 +1,10 @@ title: News ctime: 2009-12-16 +mtime: 2012-08-15 -### 2012-08-13 -Post [[Virtual Windows 7|virtual-win7]] article, and perform some -cleanups. +### 2012-08-15 +Reorganize the website into three categories: [[blog]], [[misc]], and +[[projects]]. --- diff --git a/in/oss-web.md b/in/oss-web.md deleted file mode 100644 index 2a4748e..0000000 --- a/in/oss-web.md +++ /dev/null @@ -1,8 +0,0 @@ -title: OSS Website Code -linktitle: oss-web -parent: Home -ctime: 2009-12-15 - -Repositories: [oss-web](/gitweb/?p=oss-web.git;a=summary). - -This website is statically generated from the repository using [[Webber]]. diff --git a/in/projects.md b/in/projects.md new file mode 100644 index 0000000..2d5f8e1 --- /dev/null +++ b/in/projects.md @@ -0,0 +1,8 @@ +title: Projects +linktitle: projects +parent: Home +ctime: 2012-08-15 +mtime: 2000-01-01 + +TMI has posted code and info for various projects on this website. Navigate the +projects from the left pane. diff --git a/in/cp210x.md b/in/projects/cp210x.md similarity index 98% rename from in/cp210x.md rename to in/projects/cp210x.md index 78034c6..0f49413 100644 --- a/in/cp210x.md +++ b/in/projects/cp210x.md @@ -1,7 +1,8 @@ title: CP210X linktitle: cp210x -parent: Home +parent: projects ctime: 2009-12-10 +mtime: 2012-07-03 Repositories: [cp210x](/gitweb/?p=cp210x.git;a=summary), [[aptrepo]]. diff --git a/in/git-utils.md b/in/projects/git-utils.md similarity index 98% rename from in/git-utils.md rename to in/projects/git-utils.md index a60f2cf..3aa0a43 100644 --- a/in/git-utils.md +++ b/in/projects/git-utils.md @@ -1,7 +1,8 @@ title: GIT Utilities linktitle: git-utils -parent: Home +parent: projects ctime: 2009-12-10 +mtime: 2012-05-16 Repositories: [git-utils](/gitweb/?p=git-utils.git;a=summary). diff --git a/in/ovzbpc.md b/in/projects/ovzbpc.md similarity index 97% rename from in/ovzbpc.md rename to in/projects/ovzbpc.md index 2519c38..b6020ba 100644 --- a/in/ovzbpc.md +++ b/in/projects/ovzbpc.md @@ -1,7 +1,8 @@ title: OpenVZ + BackupPC linktitle: ovzbpc -parent: Home +parent: projects ctime: 2008-06-09 +mtime: 2009-12-16 Repositories: [ovzbpc](/gitweb/?p=ovzbpc.git;a=summary). diff --git a/in/rgblamp.md b/in/projects/rgblamp.md similarity index 93% rename from in/rgblamp.md rename to in/projects/rgblamp.md index 4b6ac06..822331d 100644 --- a/in/rgblamp.md +++ b/in/projects/rgblamp.md @@ -1,7 +1,8 @@ title: RGB Lamp linktitle: rgblamp -parent: Home -ctime: 2012-03-24 +parent: projects +ctime: 2012-03-10 +mtime: 2012-03-10 The RGB Lamp was a little filler project. A 4.2W CREE RGBW LED module is driven by a PIC16LF1933. Learn more: diff --git a/in/rgblamp/code.md b/in/projects/rgblamp/code.md similarity index 96% rename from in/rgblamp/code.md rename to in/projects/rgblamp/code.md index b6086f0..33f06f8 100644 --- a/in/rgblamp/code.md +++ b/in/projects/rgblamp/code.md @@ -1,7 +1,8 @@ title: RGB Lamp Code linktitle: rgb-code parent: rgblamp -ctime: 2012-03-24 +ctime: 2012-03-10 +mtime: 2012-03-10 PIC code for the [[rgblamp]] is written in C and compiled using the MPLAB X cross-platform IDE and the HI-TECH C compiler. diff --git a/in/rgblamp/features.md b/in/projects/rgblamp/features.md similarity index 97% rename from in/rgblamp/features.md rename to in/projects/rgblamp/features.md index 81a9a80..76e56b7 100644 --- a/in/rgblamp/features.md +++ b/in/projects/rgblamp/features.md @@ -1,7 +1,8 @@ title: RGB Lamp Features linktitle: rgb-features parent: rgblamp -ctime: 2012-03-24 +ctime: 2012-03-10 +mtime: 2012-03-10 # [[rgblamp]] features diff --git a/in/rgblamp/leds.md b/in/projects/rgblamp/leds.md similarity index 98% rename from in/rgblamp/leds.md rename to in/projects/rgblamp/leds.md index 385b4f3..4eb8535 100644 --- a/in/rgblamp/leds.md +++ b/in/projects/rgblamp/leds.md @@ -1,7 +1,8 @@ title: RGB Lamp Led Driver linktitle: rgb-leds parent: rgb-code -ctime: 2012-03-24 +ctime: 2012-03-10 +mtime: 2012-03-10 # PWM drive diff --git a/in/rgblamp/mechanical.md b/in/projects/rgblamp/mechanical.md similarity index 98% rename from in/rgblamp/mechanical.md rename to in/projects/rgblamp/mechanical.md index 88653ed..24023dd 100644 --- a/in/rgblamp/mechanical.md +++ b/in/projects/rgblamp/mechanical.md @@ -1,7 +1,8 @@ title: RGB Lamp Features linktitle: rgb-mechanical parent: rgblamp -ctime: 2012-03-24 +ctime: 2012-03-10 +mtime: 2012-03-10 The [[rgblamp]] mechanicals are based on a little rectangular lamp purchased at IKEA. The CREE LED module is placed on a 1/2 inch think heat sink designed for diff --git a/in/rgblamp/random.md b/in/projects/rgblamp/random.md similarity index 96% rename from in/rgblamp/random.md rename to in/projects/rgblamp/random.md index 3a26df2..65b2b93 100644 --- a/in/rgblamp/random.md +++ b/in/projects/rgblamp/random.md @@ -1,7 +1,8 @@ title: A Source of Randomness linktitle: rgb-random parent: rgb-code -ctime: 2012-03-24 +ctime: 2012-03-10 +mtime: 2012-03-10 # Randomness diff --git a/in/rgblamp/task.md b/in/projects/rgblamp/task.md similarity index 98% rename from in/rgblamp/task.md rename to in/projects/rgblamp/task.md index 30759f2..4c29f6c 100644 --- a/in/rgblamp/task.md +++ b/in/projects/rgblamp/task.md @@ -1,7 +1,8 @@ title: RGB Lamp Tasks linktitle: rgb-task parent: rgb-code -ctime: 2012-03-24 +ctime: 2012-03-10 +mtime: 2012-03-10 # Tasks diff --git a/in/rgblamp/timer.md b/in/projects/rgblamp/timer.md similarity index 98% rename from in/rgblamp/timer.md rename to in/projects/rgblamp/timer.md index b851a20..d9a2528 100644 --- a/in/rgblamp/timer.md +++ b/in/projects/rgblamp/timer.md @@ -1,7 +1,8 @@ title: RGB Lamp Timers linktitle: rgb-timer parent: rgb-code -ctime: 2012-03-24 +ctime: 2012-03-10 +mtime: 2012-03-10 # Timers diff --git a/in/tinyos.md b/in/projects/tinyos.md similarity index 98% rename from in/tinyos.md rename to in/projects/tinyos.md index 6b9d90d..d47d43b 100644 --- a/in/tinyos.md +++ b/in/projects/tinyos.md @@ -1,7 +1,8 @@ title: TinyOS linktitle: tinyos -parent: Home +parent: projects ctime: 2009-12-07 +mtime: 2012-03-21 Repositories: [tinyos](/gitweb/?p=tinyos-2.x.git;a=summary), [deputy-tinyos](/gitweb/?p=deputy-tinyos.git;a=summary), diff --git a/in/tmicore.md b/in/projects/tmicore.md similarity index 96% rename from in/tmicore.md rename to in/projects/tmicore.md index 91b4d0c..2ff32b3 100644 --- a/in/tmicore.md +++ b/in/projects/tmicore.md @@ -1,6 +1,7 @@ title: tmicore -parent: Home +parent: projects ctime: 2009-12-02 +mtime: 2009-12-02 Repositories: SOON diff --git a/in/style/default.tmpl b/in/style/default.tmpl index e7bea88..ec48ef4 100644 --- a/in/style/default.tmpl +++ b/in/style/default.tmpl @@ -99,7 +99,7 @@ oss@this.domain
<% - recently = get_recently() + recently = get_recently(max_items = 20) %> % if len(recently) > 1:

Recent Changes

@@ -133,7 +133,7 @@ ${self.contents()}

-Copyright (C) 2001-2011 Titanium Mirror, Inc. All Rights Reserved

+Copyright (C) 2001-2012 Titanium Mirror, Inc. All Rights Reserved

This page last updated ${format_date(file.mtime)}

diff --git a/in/tinyospkgs.md b/in/tinyospkgs.md index 789bfef..50d45b4 100644 --- a/in/tinyospkgs.md +++ b/in/tinyospkgs.md @@ -2,6 +2,7 @@ title: TinyOS Packages linktitle: tinyospkgs parent: aptrepo ctime: 2009-12-10 +mtime: 2012-07-09 Repositories: [tinyos](/gitweb/?p=tinyos-2.x.git;a=summary), [deputy-tinyos](/gitweb/?p=deputy-tinyos.git;a=summary), -- 2.39.2