[Mageia-sysadm] [203] - remove uneeded include, and remove the old config file
root at mageia.org
root at mageia.org
Mon Nov 8 02:47:08 CET 2010
Revision: 203
Author: misc
Date: 2010-11-08 02:47:08 +0100 (Mon, 08 Nov 2010)
Log Message:
-----------
- remove uneeded include, and remove the old config file
Modified Paths:
--------------
puppet/modules/catdap/manifests/init.pp
Removed Paths:
-------------
puppet/modules/catdap/templates/catdap_vhost.conf
Modified: puppet/modules/catdap/manifests/init.pp
===================================================================
--- 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 = "/var/www/identity"
$catdap_vhost = "identity.$domain"
@@ -42,15 +38,4 @@
}
apache::vhost_redirect_ssl { $catdap_vhost: }
-
- # add a apache vhost
-# file { "$catdap_vhost.conf":
-# path => "/etc/httpd/conf/vhosts.d/$catdap_vhost.conf",
-# ensure => "present",
-# owner => root,
-# group => root,
-# mode => 644,
-# notify => Service['apache'],
-# content => template("catdap/catdap_vhost.conf")
-# }
}
Deleted: puppet/modules/catdap/templates/catdap_vhost.conf
===================================================================
--- 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 @@
-<VirtualHost *:80>
- ServerName <%= catdap_vhost %>
- # Serve static content directly
- DocumentRoot <%= catdap_location %>/root
- Alias /static <%= catdap_location %>/root/static
-
- Alias / <%= catdap_location %>/script/catdap_fastcgi.pl/
-
- <Directory <%= catdap_location %>/script>
- Options +ExecCGI
- SetHandler fcgid-script
- Allow from all
- </Directory>
-</VirtualHost>
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101108/4d4ccdba/attachment.html>
More information about the Mageia-sysadm
mailing list