aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-08 01:47:08 +0000
committerMichael Scherer <misc@mageia.org>2010-11-08 01:47:08 +0000
commit25189433b9486add27449ab5c3e108696d9974cd (patch)
treebe924d571d38a1875dfa85c0526694733420da1a /modules
parent34bc287d95c1bcec044d62adcd7d957bbf642e31 (diff)
downloadpuppet-25189433b9486add27449ab5c3e108696d9974cd.tar
puppet-25189433b9486add27449ab5c3e108696d9974cd.tar.gz
puppet-25189433b9486add27449ab5c3e108696d9974cd.tar.bz2
puppet-25189433b9486add27449ab5c3e108696d9974cd.tar.xz
puppet-25189433b9486add27449ab5c3e108696d9974cd.zip
- remove uneeded include, and remove the old config file
Diffstat (limited to 'modules')
-rw-r--r--modules/catdap/manifests/init.pp15
-rw-r--r--modules/catdap/templates/catdap_vhost.conf15
2 files changed, 0 insertions, 30 deletions
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>
-