diff options
author | Michael Scherer <misc@mageia.org> | 2011-06-07 01:29:16 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2011-06-07 01:29:16 +0000 |
commit | 66dfa93043fe18ecb4979a6d4d058082d017f4ea (patch) | |
tree | 94771646a48cf3b78992c7d0bd87a70e67b21ff5 | |
parent | 38312b860a4ea9809194e8aa1832e6c9d3884605 (diff) | |
download | puppet-66dfa93043fe18ecb4979a6d4d058082d017f4ea.tar puppet-66dfa93043fe18ecb4979a6d4d058082d017f4ea.tar.gz puppet-66dfa93043fe18ecb4979a6d4d058082d017f4ea.tar.bz2 puppet-66dfa93043fe18ecb4979a6d4d058082d017f4ea.tar.xz puppet-66dfa93043fe18ecb4979a6d4d058082d017f4ea.zip |
remove donate ( set to be expired on june, according to comment )
-rw-r--r-- | deployment/websites/manifests/init.pp | 7 | ||||
-rw-r--r-- | manifests/nodes.pp | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/deployment/websites/manifests/init.pp b/deployment/websites/manifests/init.pp index ae4c2427..790ec704 100644 --- a/deployment/websites/manifests/init.pp +++ b/deployment/websites/manifests/init.pp @@ -3,13 +3,6 @@ class websites { $webdatadir = '/var/www/vhosts' } - # should expire on June 2011 - class donate { - apache::vhost_other_app { "donate.$domain": - vhost_file => "websites/vhost_donate.conf", - } - } - # vhost to host static files used by web sites class static inherits base { $vhostdir = "$webdatadir/static.$domain" diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 1eac79a9..1e55cd48 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -65,7 +65,6 @@ node alamut { timezone::timezone { "Europe/Paris": } include catdap - include websites::donate include mga-mirrors include epoll include transifex |