diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101106/d6a616a0/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101106/d6a616a0/attachment-0001.html | 174 |
1 files changed, 174 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101106/d6a616a0/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101106/d6a616a0/attachment-0001.html new file mode 100644 index 000000000..ed45adaea --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101106/d6a616a0/attachment-0001.html @@ -0,0 +1,174 @@ +<!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>[168] - refactor catalyst application config using a common class ( catdap is next )</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>168</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-06 00:41:36 +0100 (Sat, 06 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- refactor catalyst application config using a common class ( catdap is next )</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesepollmanifestsinitpp">puppet/modules/epoll/manifests/init.pp</a></li> +<li><a href="#puppetmodulesmgamirrorsmanifestsinitpp">puppet/modules/mga-mirrors/manifests/init.pp</a></li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#puppetmodulesepolltemplatesepoll_vhostconf">puppet/modules/epoll/templates/epoll_vhost.conf</a></li> +<li><a href="#puppetmodulesmgamirrorstemplatesmirrors_vhostconf">puppet/modules/mga-mirrors/templates/mirrors_vhost.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesepollmanifestsinitpp">Modified: puppet/modules/epoll/manifests/init.pp</a> +=================================================================== +--- puppet/modules/epoll/manifests/init.pp 2010-11-05 23:29:16 UTC (rev 167) ++++ puppet/modules/epoll/manifests/init.pp 2010-11-05 23:41:36 UTC (rev 168) +@@ -1,23 +1,15 @@ + class epoll { + +- include apache::mod_fastcgi +- + $vhost = "epoll.$domain" ++ + package { 'Epoll': + ensure => installed + } +- +- # add a apache vhost +- file { "$vhost.conf": +- path => "/etc/httpd/conf/vhosts.d/$vhost.conf", +- ensure => "present", +- owner => root, +- group => root, +- mode => 644, +- notify => Service['apache'], +- content => template("epoll/epoll_vhost.conf") ++ ++ apache::vhost_catalyst_app { $vhost: ++ script => /usr/bin/epoll_fastcgi.pl + } +- ++ + $password = extlookup("epoll_password") + + file { "epoll.yml": + +<a id="puppetmodulesepolltemplatesepoll_vhostconf">Deleted: puppet/modules/epoll/templates/epoll_vhost.conf</a> +=================================================================== +--- puppet/modules/epoll/templates/epoll_vhost.conf 2010-11-05 23:29:16 UTC (rev 167) ++++ puppet/modules/epoll/templates/epoll_vhost.conf 2010-11-05 23:41:36 UTC (rev 168) +@@ -1,13 +0,0 @@ +-<VirtualHost *:80> +- ServerName <%= vhost %> +- # Serve static content directly +- DocumentRoot /dev/null +- +- Alias / /usr/bin/epoll_fastcgi.pl/ +- FastCgiServer /usr/bin/epoll_fastcgi.pl -processes 4 -idle-timeout 30 +- +- <Location /> +- Allow from all +- </Location> +-</VirtualHost> +- + +<a id="puppetmodulesmgamirrorsmanifestsinitpp">Modified: puppet/modules/mga-mirrors/manifests/init.pp</a> +=================================================================== +--- puppet/modules/mga-mirrors/manifests/init.pp 2010-11-05 23:29:16 UTC (rev 167) ++++ puppet/modules/mga-mirrors/manifests/init.pp 2010-11-05 23:41:36 UTC (rev 168) +@@ -2,23 +2,14 @@ + + $vhost = "mirrors.$domain" + +- include apache::mod_fastcgi +- + package { 'mga-mirrors': + ensure => installed + } + +- # add a apache vhost +- file { "$vhost.conf": +- path => "/etc/httpd/conf/vhosts.d/$vhost.conf", +- ensure => "present", +- owner => root, +- group => root, +- mode => 644, +- notify => Service['apache'], +- content => template("mga-mirrors/mirrors_vhost.conf") ++ apache::vhost_catalyst_app { $vhost: ++ script => /usr/bin/mga_mirrors_fastcgi.pl + } +- ++ + $password = extlookup("mga_mirror_password") + + file { "mga-mirrors.ini": + +<a id="puppetmodulesmgamirrorstemplatesmirrors_vhostconf">Deleted: puppet/modules/mga-mirrors/templates/mirrors_vhost.conf</a> +=================================================================== +--- puppet/modules/mga-mirrors/templates/mirrors_vhost.conf 2010-11-05 23:29:16 UTC (rev 167) ++++ puppet/modules/mga-mirrors/templates/mirrors_vhost.conf 2010-11-05 23:41:36 UTC (rev 168) +@@ -1,13 +0,0 @@ +-<VirtualHost *:80> +- ServerName <%= vhost %> +- # Serve static content directly +- DocumentRoot /dev/null +- +- Alias / /usr/bin/mga_mirrors_fastcgi.pl/ +- FastCgiServer /usr/bin/mga_mirrors_fastcgi.pl -processes 4 -idle-timeout 30 +- +- <Location /> +- Allow from all +- </Location> +-</VirtualHost> +- + +</pre></div> + +</body> +</html>
\ No newline at end of file |