Standardize on example.com names, never bogus your-server.name style

  entries.  Roy attacked this recently, but apparently there are some
  holdovers or reversions to this policy.

  Backported httpd-std.conf.in v1.54, ssl-std.conf.in v1.3

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@100848 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 685d955cb48965aa90ac7c23fad174a9adb521c3..7bfd6556e969aebc9492597b130e1b12a1b4ea47 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -274,7 +274,7 @@ Group #-1
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin@your-domain.com
 #
-ServerAdmin you@your.address
+ServerAdmin you@example.com
 
 #
 # ServerName gives the name and port that the server uses to identify itself.
@@ -288,7 +288,7 @@ ServerAdmin you@your.address
 # You will have to access it by its address anyway, and this will make 
 # redirections work in a sensible way.
 #
-#ServerName new.host.name:80
+#ServerName www.example.com:80
 
 #
 # UseCanonicalName: Determines how Apache constructs self-referencing 

diff --git a/docs/conf/ssl-std.conf b/docs/conf/ssl-std.conf
index 4bc80839194aaa97ac52890e47932b82da93ecc4..d01f5c11bd1f5249487d4104d3b770d095939c75 100644 (file)
--- a/docs/conf/ssl-std.conf
+++ b/docs/conf/ssl-std.conf
@@ -86,8 +86,8 @@ SSLRandomSeed connect builtin
 
 #  General setup for the virtual host
 DocumentRoot "@@ServerRoot@@/htdocs"
-ServerName new.host.name:443
-ServerAdmin you@your.address
+ServerName www.example.com:443
+ServerAdmin you@example.com
 ErrorLog logs/error_log
 TransferLog logs/access_log