summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-08-14 20:16:42 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-08-14 20:16:42 +0000
commit <title>[203] - remove uneeded include, and remove the old config file</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:':'
Diffstat (limited to 'kernel')
-rw-r--r--kernel/list_modules.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index a45183697..5ff997b1f 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -134,8 +134,9 @@ our %l = (
qw(ips ppa imm),
),
],
+ virtual => [ qw(xenblk virtio_blk) ],
pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs pata_pcmcia sym53c500_cs) ],
- raw => [ qw(ide-gd_mod sd_mod virtio_blk) ],
+ raw => [ qw(ide-gd_mod sd_mod) ],
usb => [ qw(usb-storage) ],
firewire => [ qw(sbp2) ],
cdrom => [ qw(ide-cd_mod sr_mod) ],
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-24 02:41:48 +0000
w: 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>203</dd> <dt>Author</dt> <dd>misc</dd> <dt>Date</dt> <dd>2010-11-08 02:47:08 +0100 (Mon, 08 Nov 2010)</dd> </dl> <h3>Log Message</h3> <pre>- remove uneeded include, and remove the old config file</pre> <h3>Modified Paths</h3> <ul> <li><a href="#puppetmodulescatdapmanifestsinitpp">puppet/modules/catdap/manifests/init.pp</a></li> </ul> <h3>Removed Paths</h3> <ul> <li><a href="#puppetmodulescatdaptemplatescatdap_vhostconf">puppet/modules/catdap/templates/catdap_vhost.conf</a></li> </ul> </div> <div id="patch"><pre> <a id="puppetmodulescatdapmanifestsinitpp">Modified: puppet/modules/catdap/manifests/init.pp</a> =================================================================== --- puppet/modules/catdap/manifests/init.pp 2010-11-08 01:16:10 UTC (rev 202) +++ puppet/modules/catdap/manifests/init.pp 2010-11-08 01:47:08 UTC (rev 203) @@ -1,9 +1,5 @@ class catdap { - include subversion - include subversion::client - include apache::mod_fcgid - $catdap_location = &quot;/var/www/identity&quot; $catdap_vhost = &quot;identity.$domain&quot; @@ -42,15 +38,4 @@ } apache::vhost_redirect_ssl { $catdap_vhost: } - - # add a apache vhost -# file { &quot;$catdap_vhost.conf&quot;: -# path =&gt; &quot;/etc/httpd/conf/vhosts.d/$catdap_vhost.conf&quot;, -# ensure =&gt; &quot;present&quot;, -# owner =&gt; root, -# group =&gt; root, -# mode =&gt; 644, -# notify =&gt; Service['apache'], -# content =&gt; template(&quot;catdap/catdap_vhost.conf&quot;) -# } } <a id="puppetmodulescatdaptemplatescatdap_vhostconf">Deleted: puppet/modules/catdap/templates/catdap_vhost.conf</a> =================================================================== --- puppet/modules/catdap/templates/catdap_vhost.conf 2010-11-08 01:16:10 UTC (rev 202) +++ puppet/modules/catdap/templates/catdap_vhost.conf 2010-11-08 01:47:08 UTC (rev 203) @@ -1,15 +0,0 @@ -&lt;VirtualHost *:80&gt; - ServerName &lt;%= catdap_vhost %&gt; - # Serve static content directly - DocumentRoot &lt;%= catdap_location %&gt;/root - Alias /static &lt;%= catdap_location %&gt;/root/static - - Alias / &lt;%= catdap_location %&gt;/script/catdap_fastcgi.pl/ - - &lt;Directory &lt;%= catdap_location %&gt;/script&gt; - Options +ExecCGI - SetHandler fcgid-script - Allow from all - &lt;/Directory&gt; -&lt;/VirtualHost&gt; - </pre></div> </body> </html>
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-24 02:41:48 +0000