diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/attachments/20101108/1b807d14/attachment.html | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101108/1b807d14/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101108/1b807d14/attachment.html | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101108/1b807d14/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101108/1b807d14/attachment.html new file mode 100644 index 000000000..5b10c38e5 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101108/1b807d14/attachment.html @@ -0,0 +1,136 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[208] - remove comment ( not really needed )</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>208</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-08 14:30:00 +0100 (Mon, 08 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- remove comment ( not really needed ) +- use domain instead of hardcoding the url</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesapachetemplates00_default_vhostsconf">puppet/modules/apache/templates/00_default_vhosts.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesapachetemplates00_default_vhostsconf">Modified: puppet/modules/apache/templates/00_default_vhosts.conf</a> +=================================================================== +--- 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> + +</pre></div> + +</body> +</html>
\ No newline at end of file |