summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2014-08-03 11:51:41 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2014-08-03 11:51:41 +0000
commitea0275efc02638cf12bc270bf4c649e632202892 (patch)
tree1099045f9f1dae544101313736c99a91433d059e /etc
parent312d22391528659038293a27554287e9615237ed (diff)
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.
Diffstat (limited to 'etc')
-rw-r--r--etc/examples/httpd.conf19
1 files changed, 14 insertions, 5 deletions
diff --git a/etc/examples/httpd.conf b/etc/examples/httpd.conf
index ea70315ffa0..43edfaa3a74 100644
--- a/etc/examples/httpd.conf
+++ b/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"
}