From ff7f5de360b0a5c4a20b21cf2a80cf9daa2aade0 Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Sun, 3 Aug 2014 11:51:40 +0000
Subject: [PATCH] The first server example should be the "minimal default" to
 illustrate that you don't have to push all kinds of buttons to run httpd.

---
 src/etc/examples/httpd.conf | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/etc/examples/httpd.conf b/src/etc/examples/httpd.conf
index ea70315f..43edfaa3 100644
--- a/src/etc/examples/httpd.conf
+++ b/src/etc/examples/httpd.conf
@@ -1,14 +1,27 @@
-# $OpenBSD: httpd.conf,v 1.5 2014/08/03 11:28:58 reyk Exp $
+# $OpenBSD: httpd.conf,v 1.6 2014/08/03 11:51:40 reyk Exp $
 
+#
 # Macros
+#
 ext_addr="egress"
 
+#
 # Global Options
+#
 # prefork 3
 
+#
 # Servers
+#
+
+# A minimal default server
 server "default" {
 	listen on $ext_addr port 80
+}
+
+# A name-based "virtual" server on the same address
+server "www.example.com" {
+	listen on $ext_addr port 80
 
 	# Logging is enabled by default, but it can be turned off per server
 	#no log
@@ -28,11 +41,7 @@ server "default" {
 		# The /cgi-bin directory is outside of the document root
 		root "/"
 	}
-}
 
-# A name-based "virtual" server on the same address
-server "www.example.com" {
-	listen on $ext_addr port 80
 	root "/htdocs/www.example.com"
 }