22 files changed, 110 insertions, 35 deletions

diff --git a/bin/build-web-site b/bin/build-web-site
index 95ac355..9886b7a 100755
--- a/bin/build-web-site
+++ b/bin/build-web-site
@@ -16,31 +16,42 @@ set -e
 set -u
 
 prefix='/home/plugins'
-poole_dir="$prefix/web/generator"
-site_source_dir="$prefix/exported/site/web/content"
-site_target_dir="$poole_dir/input"
+
+export PATH="$prefix/src/poole:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
+
+myself=${0##*/}
 man_source_dir="$prefix/web/work/man"
-man_target_dir="$site_target_dir/doc/man"
 guidelines_source="$prefix/web/work/guidelines.html"
-guidelines_target="$site_target_dir/doc/guidelines.html"
+site_target_dir=$(mktemp -d "/tmp/$myself.XXXXXX")
+man_target_dir="$site_target_dir/input/doc/man"
+guidelines_target="$site_target_dir/input/doc/guidelines.html"
 
-export PATH="$prefix/src/poole:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
+trap 'rm -rf "$site_target_dir"' EXIT
+
+if [ $# -gt 0 ] && [ "$1" = '-t' ]
+then    # Build test instance.
+        site_source_dir="$prefix/exported/site-test/web"
+        output_dir="$prefix/web/test"
+else
+        site_source_dir="$prefix/exported/site/web"
+        output_dir="$prefix/web/site"
+fi
 
 #
-# Collect the pieces of the site.
+# Collect the pieces of the site, and create a link to the output directory.
 #
-rsync -aH --delete "$site_source_dir/" "$site_target_dir"
+rsync -aH "$site_source_dir/" "$site_target_dir"
 rsync -aH "$man_source_dir/" "$man_target_dir"
 cp -p "$guidelines_source" "$guidelines_target"
-
-cd "$poole_dir"
+ln -s "$output_dir" "$site_target_dir/output"
 
 #
 # See http://pythonhosted.org/Markdown/extensions/ for documentation on the
 # extensions.
 #
-exec poole.py --build   \
-    --md-ext='extra'    \
-    --md-ext='headerid' \
-    --md-ext='toc'      \
-    --md-ext='wikilinks'
+poole.py --build                \
+    --md-ext='extra'            \
+    --md-ext='headerid'         \
+    --md-ext='toc'              \
+    --md-ext='wikilinks'        \
+    "$site_target_dir"
diff --git a/bin/git-export b/bin/git-export
index fc76081..06d832a 100755
--- a/bin/git-export
+++ b/bin/git-export
@@ -18,23 +18,38 @@ set -u
 export PATH='/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin'
 
 export_prefix='/home/plugins/exported'
-export_branch='master'
 myself=${0##*/}
 
-if [ $# -lt 1 ]
-then
-        echo >&2 "Usage: $myself <repository> ..."
+usage()
+{
+        echo >&2 "Usage: $myself [-b <branch>] <repository> ..."
         exit 2
-fi
+}
+
+while getopts b: option
+do
+        case $option in
+        b)
+                branch=$OPTARG
+                ;;
+        *)
+                usage
+                ;;
+        esac
+done
+
+shift $((OPTIND - 1))
+test $# -ge 1 || usage
 
 for repository in "$@"
 do
         export_dir="$export_prefix/${repository##*/}"
         export_dir=${export_dir%.git}
+        export_dir="$export_dir${branch:+-$branch}"
 
         cd "$repository"
         rm -r -f "$export_dir"
         mkdir -p "$export_dir"
-        git archive "$export_branch" | tar -x -C "$export_dir" -f -
+        git archive "${branch:-master}" | tar -x -C "$export_dir" -f -
         cd "$OLDPWD"
 done
diff --git a/etc/nginx/site.conf b/etc/nginx/site.conf
index 432c051..9105591 100644
--- a/etc/nginx/site.conf
+++ b/etc/nginx/site.conf
@@ -14,8 +14,9 @@
 #
 server {
         listen 443 ssl;
+        listen 444 ssl;
         server_name www.nagios-plugins.org;
-        root /home/plugins/web/site;
+        root /home/plugins/web/port-$server_port;
 
         #
         # Downloads and attachments.
@@ -71,9 +72,15 @@ server {
 
 #
 # Redirect HTTP and all other domains to <https://www.nagios-plugins.org/>.
+# Ditto for the test instance.
 #
 server {
         listen 80 default_server;
         listen 443 default_server ssl;
         return 301 https://www.nagios-plugins.org$request_uri;
 }
+server {
+        listen 81 default_server;
+        listen 444 default_server ssl;
+        return 301 https://www.nagios-plugins.org:444$request_uri;
+}
diff --git a/libexec/post-receive.d/01-git-export b/libexec/post-receive.d/01-git-export
index 37994e2..171f05f 100755
--- a/libexec/post-receive.d/01-git-export
+++ b/libexec/post-receive.d/01-git-export
@@ -19,4 +19,26 @@ export PATH='/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin'
 
 prefix='/home/plugins'
 
+#
+# Check whether the "test" branch of the "site.git" repository has been updated.
+#
+if [ "${PWD##*/}" = 'site.git' ]
+then
+        forty_zeros=$(printf '%.40d' '0')
+
+        while read old new ref
+        do
+                if [ "$ref" = 'refs/heads/test' ]
+                then
+                        if [ "$new" != "$forty_zeros" ]
+                        then
+                                "$prefix/bin/git-export" -b 'test' "$PWD"
+                        else
+                                rm -rf "$prefix/exported/site-test"
+                        fi
+                        break
+                fi
+        done
+fi
+
 exec "$prefix/bin/git-export" "$PWD"
diff --git a/libexec/post-receive.d/04-build-web-site b/libexec/post-receive.d/04-build-web-site
index 7c178cf..6338968 100755
--- a/libexec/post-receive.d/04-build-web-site
+++ b/libexec/post-receive.d/04-build-web-site
@@ -19,17 +19,37 @@ export PATH='/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin'
 
 prefix='/home/plugins'
 repository=${PWD##*/}
-web_repositories='nagios-plugins.git site.git'
-web_branch='master'
+plugins_repository='nagios-plugins.git'
+web_repository='site.git'
+prod_branch='master'
+test_branch='test'
+test_directory="$prefix/web/test"
 
-for web_repository in $web_repositories
-do
-        if [ "$repository" = "$web_repository" ]
-        then
-                while read old new ref
-                do
-                        test "${ref#refs/heads/}" = "$web_branch" \
-                            && exec "$prefix/bin/build-web-site" >'/dev/null'
-                done
-        fi
-done
+if [ "$repository" = "$plugins_repository" ] \
+    || [ "$repository" = "$web_repository" ]
+then
+        forty_zeros=$(printf '%.40d' '0')
+
+        while read old new ref
+        do
+                branch=${ref#refs/heads/}
+
+                if [ "$branch" = "$prod_branch" ]
+                then
+                        "$prefix/bin/build-web-site" >'/dev/null'
+                elif [ "$repository" = "$web_repository" ] \
+                    && [ "$branch" = "$test_branch" ]
+                then
+                        if [ "$new" != "$forty_zeros" ]
+                        then
+                                "$prefix/bin/build-web-site" -t >'/dev/null'
+                        else
+                                rm -rf "$test_directory"/*
+                        fi
+                        cat >>"$test_directory/robots.txt" <<-'EOF'
+                                User-agent: *
+                                Disallow: /
+                        EOF
+                fi
+        done
+fi
diff --git a/web/content/development.md b/web/input/development.md
index ddff634..ddff634 100644
--- a/web/content/development.md
+++ b/web/input/development.md
diff --git a/web/content/doc/extra-opts.md b/web/input/doc/extra-opts.md
index 542c199..542c199 100644
--- a/web/content/doc/extra-opts.md
+++ b/web/input/doc/extra-opts.md
diff --git a/web/content/doc/faq/index.md b/web/input/doc/faq/index.md
index 18584f2..18584f2 100644
--- a/web/content/doc/faq/index.md
+++ b/web/input/doc/faq/index.md
diff --git a/web/content/doc/index.md b/web/input/doc/index.md
index 7b2d098..7b2d098 100644
--- a/web/content/doc/index.md
+++ b/web/input/doc/index.md
diff --git a/web/content/doc/man/index.md b/web/input/doc/man/index.md
index d3c60c8..d3c60c8 100644
--- a/web/content/doc/man/index.md
+++ b/web/input/doc/man/index.md
diff --git a/web/content/doc/news.txt b/web/input/doc/news.txt
index f5208d5..f5208d5 120000
--- a/web/content/doc/news.txt
+++ b/web/input/doc/news.txt
diff --git a/web/content/doc/presentation.md b/web/input/doc/presentation.md
index 458b101..458b101 100644
--- a/web/content/doc/presentation.md
+++ b/web/input/doc/presentation.md
diff --git a/web/content/doc/release-notes/1-5.md b/web/input/doc/release-notes/1-5.md
index b8f3457..b8f3457 100644
--- a/web/content/doc/release-notes/1-5.md
+++ b/web/input/doc/release-notes/1-5.md
diff --git a/web/content/download.md b/web/input/download.md
index 4d46cf5..4d46cf5 100644
--- a/web/content/download.md
+++ b/web/input/download.md
diff --git a/web/content/impressum.md b/web/input/impressum.md
index 1fba23b..1fba23b 100644
--- a/web/content/impressum.md
+++ b/web/input/impressum.md
diff --git a/web/content/index.md b/web/input/index.md
index 8ab186c..8ab186c 100644
--- a/web/content/index.md
+++ b/web/input/index.md
diff --git a/web/content/media/favicon.ico b/web/input/media/favicon.ico
index 76ae569..76ae569 100644
--- a/web/content/media/favicon.ico
+++ b/web/input/media/favicon.ico
diff --git a/web/content/media/github.png b/web/input/media/github.png
index 1e19c21..1e19c21 100644
--- a/web/content/media/github.png
+++ b/web/input/media/github.png
diff --git a/web/content/media/plugins.css b/web/input/media/plugins.css
index 552284f..552284f 100644
--- a/web/content/media/plugins.css
+++ b/web/input/media/plugins.css
diff --git a/web/content/support.md b/web/input/support.md
index c6d8b3d..c6d8b3d 100644
--- a/web/content/support.md
+++ b/web/input/support.md
diff --git a/web/content/team.md b/web/input/team.md
index f9b0a5d..f9b0a5d 100644
--- a/web/content/team.md
+++ b/web/input/team.md
diff --git a/web/content/tests.md b/web/input/tests.md
index bad78a9..bad78a9 100644
--- a/web/content/tests.md
+++ b/web/input/tests.md