Improved documentation of the base puppet script.

puppet/manifests/base.pp

@@ -1,40 +1,50 @@
 # -*- mode: puppet -*-
 # vi: set ft=puppet :
 
+
 group { "puppet": 
   ensure => present,
 }
 
+# Add a stage which precedes the main installation routine.
 stage {"pre": before => Stage["main"]}
+# Ensure apt updates before running the main installation routine.
 class {'apt': stage => 'pre'}
 
+# Seriously, no-one gets by without vim and the like these days.
 package { 'vim': }
 package { 'vim-puppet': }
 package { 'curl': }
 
-# Global.
+# TODO: Get a bunch of vim syntax files here, like nginx, vcl, etc.
+#       Oh, and rewrite the filetype settings.
+#       Seriously, .module IS NOT a Pascal file.
+
+
+# Services used to run Drupal.
 package { 'apache2': }
 package { 'mysql-server': }
 package { 'memcached': }
 package { 'varnish': }
 
+# PHP and a bunch of PHP extensions.
 package { 'php5': }
 package { 'php5-cli': }
-package { 'php5-dev': }
 package { 'php-apc': }
-
 package { 'php5-curl': }
 package { 'php5-gd': }
 package { 'php5-memcache': }
 package { 'php5-memcached': }
 package { 'php5-mysql': }
-package { 'php5-xdebug': }
 package { 'php5-xsl': }
 
 
-# Dev-only.
+# These packages would normally only be used in Dev.
 class {'avahi': }
+
 package { 'gcc': }
 package { 'make': }
 package { 'git-core': }
 package { 'subversion': }
+package { 'php5-dev': }
+package { 'php5-xdebug': }

puppet/modules/avahi-publish-vhosts/files/apache-list-vhosts.sh

@@ -0,0 +1,4 @@
+# The following command is used to list all the named virtual hosts declared in
+# Apache, which end with the suffix '.local'.
+# These are typically announced via Avahi.
+apache2ctl -S 2>/dev/null | grep 'namevhost' |sed "s:.*namevhost \([^ ]*\) .*$:\1:" | grep -e '\.local$'