From 9cd1b1d64013e982370d18ab5daeae0501c4dc3a Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sun, 9 Jan 2011 11:15:15 +0000
Subject: move websites module to deployment

---
 modules/websites/manifests/init.pp           |  8 --------
 modules/websites/templates/vhost_donate.conf | 16 ----------------
 2 files changed, 24 deletions(-)
 delete mode 100644 modules/websites/manifests/init.pp
 delete mode 100644 modules/websites/templates/vhost_donate.conf

(limited to 'modules')

diff --git a/modules/websites/manifests/init.pp b/modules/websites/manifests/init.pp
deleted file mode 100644
index 96ae58d9..00000000
--- a/modules/websites/manifests/init.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class websites {
-    # should expire on June 2011
-    class donate {
-        apache::vhost_other_app { "donate.$domain":
-            vhost_file => "websites/vhost_donate.conf",
-        }
-    }
-}
diff --git a/modules/websites/templates/vhost_donate.conf b/modules/websites/templates/vhost_donate.conf
deleted file mode 100644
index c2f5c551..00000000
--- a/modules/websites/templates/vhost_donate.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<VirtualHost *:80>
-    ServerName donate.<%= domain %>
-    ServerAlias donation.<%= domain %>
-
-    RewriteEngine on
-    RewriteRule ^/?$ http://www.<%= domain %>/en/donate/ [R=permanent,L]
-    RewriteRule ^/(.*)$ http://www.<%= domain %>/$1/donate/ [R=permanent,L]
-    #DocumentRoot /dev/null
-    CustomLog /var/log/httpd/donate_log combined
-    ErrorLog  /var/log/httpd/error_donate_log
- 
-    <Location />
-       Allow from all
-    </Location>
-
-</VirtualHost>
-- 
cgit v1.2.1