From 25189433b9486add27449ab5c3e108696d9974cd Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Mon, 8 Nov 2010 01:47:08 +0000
Subject: - remove uneeded include, and remove the old config file

---
 modules/catdap/manifests/init.pp           | 15 ---------------
 modules/catdap/templates/catdap_vhost.conf | 15 ---------------
 2 files changed, 30 deletions(-)
 delete mode 100644 modules/catdap/templates/catdap_vhost.conf

(limited to 'modules')

diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp
index 78b1d372..ad97fc29 100644
--- a/modules/catdap/manifests/init.pp
+++ b/modules/catdap/manifests/init.pp
@@ -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 @@ class catdap {
     }
 
     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")
-#    }    
 }
diff --git a/modules/catdap/templates/catdap_vhost.conf b/modules/catdap/templates/catdap_vhost.conf
deleted file mode 100644
index a6a2f0b9..00000000
--- a/modules/catdap/templates/catdap_vhost.conf
+++ /dev/null
@@ -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>
-
-- 
cgit v1.2.1