You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2003/07/29 22:18:03 UTC
cvs commit: httpd-2.0/docs/conf httpd-std.conf.in ssl-std.conf
wrowe 2003/07/29 13:18:03
Modified: docs/conf Tag: APACHE_2_0_BRANCH httpd-std.conf.in
ssl-std.conf
Log:
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
Revision Changes Path
No revision
No revision
1.27.2.17 +2 -2 httpd-2.0/docs/conf/httpd-std.conf.in
Index: httpd-std.conf.in
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
retrieving revision 1.27.2.16
retrieving revision 1.27.2.17
diff -u -r1.27.2.16 -r1.27.2.17
--- httpd-std.conf.in 21 Jul 2003 15:56:46 -0000 1.27.2.16
+++ httpd-std.conf.in 29 Jul 2003 20:18:02 -0000 1.27.2.17
@@ -274,7 +274,7 @@
# 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 @@
# 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
1.11.2.1 +2 -2 httpd-2.0/docs/conf/Attic/ssl-std.conf
Index: ssl-std.conf
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/Attic/ssl-std.conf,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- ssl-std.conf 20 Nov 2002 22:30:56 -0000 1.11
+++ ssl-std.conf 29 Jul 2003 20:18:02 -0000 1.11.2.1
@@ -86,8 +86,8 @@
# 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