[Mageia-sysadm] [208] - remove comment ( not really needed )

[root at mageia.org]

Revision: 208
Author:   misc
Date:     2010-11-08 14:30:00 +0100 (Mon, 08 Nov 2010)
Log Message:
-----------
- remove comment ( not really needed )
- use domain instead of hardcoding the url

Modified Paths:
--------------
    puppet/modules/apache/templates/00_default_vhosts.conf

Modified: puppet/modules/apache/templates/00_default_vhosts.conf
===================================================================
--- puppet/modules/apache/templates/00_default_vhosts.conf	2010-11-08 13:13:13 UTC (rev 207)
+++ puppet/modules/apache/templates/00_default_vhosts.conf	2010-11-08 13:30:00 UTC (rev 208)
@@ -1,65 +1,7 @@
-# $Id: 00_default_vhosts.conf 250119 2008-07-26 14:51:31Z oden $
-# $HeadURL: svn+ssh://svn.mandriva.com/svn/packages/cooker/apache-conf/current/SOURCES/00_default_vhosts.conf $
-# This is an example VirtualHosts configuration.
-#
-# Since Apache 1.3.19, we modified the setup to include some nice tricks:
-#
-# - We added the User and Group directives so VirtualHosts now work with
-#   suexec directive. If set, Apache will run all cgi scripts under that
-#   user and group (provided the uid and gid are > 100 for security). The
-#   directories and cgi files *must* belong to that user/group for the
-#   feature to work
-#
-# - We added the Setenv VLOG directive. This works in conjunction with
-#   the CustomLog in common.conf. When Setenv VLOG is set, apache will
-#   create a /var/log/httpd/VLOG-YYYY-MM-<ServerName>.log instead of logging
-#   to access_log. Use this instead of defining a special logfile for
-#   each vhost, otherwise you eat up file descriptors.
-#
-# - You can also specify a path for the VLOG for each Vhost, for example,
-#   to place the logs in each user's directory. However, if you want to
-#   use the file for accounting, place it in a directory owned by root,
-#   otherwise the user will be able to erase it.
-#
-# - I suggest only including the ErrorLog *only* if the vhost will use
-#   cgi scripts. Again, it saves file descriptors! 
-
-
-################# IP-based Virtual Hosts 
-# <VirtualHost 192.168.2.100>
-# User jmdault
-# Group jmdault
-# DocumentRoot /home/jmdault/public_html
-# ServerName test2.com
-# Setenv VLOG /home/jmdault/logs
-# ErrorLogs /home/jmdault/test2-error_log
-# </VirtualHost>
-
-################# Named VirtualHosts
-# NameVirtualHost 111.222.33.44
-# <VirtualHost 111.222.33.44>
-# ServerName www.domain.tld
-# ServerPath /domain
-# DocumentRoot /web/domain
-# </VirtualHost>
-
-#<VirtualHost alice.com>
-#    ServerName alice.com
-#    # normal vhost configs
-#	<IfModule peruser.c>
-#	    # this must match a Processor line
-#	    ServerEnvironment alice users /home/alice
-#
-#	    # these are optional - defaults to the values specified above
-#	    MinSpareProcessors 4
-#	    MaxProcessors 20
-#	</IfModule>
-#</VirtualHost>
-
 <VirtualHost *:80>
 	DocumentRoot /var/www/html
 	<Location />
 		Allow from all
 	</Location>
-	Redirect / http://www.mageia.org/
+	Redirect / http://www.<%= domain %>/
 </VirtualHost>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101108/1b807d14/attachment.html>