aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-01-05 19:09:50 +0000
committerMichael Scherer <misc@mageia.org>2011-01-05 19:09:50 +0000
commite978c9693effffea36bc472d3aee84cb033c2f35 (patch)
tree01604ed2e71339531ef0a8f6db0d44364cf7dc26
parenta7e0febd9ea2874f4a2f44e95c5b90b26a4b6069 (diff)
downloadpuppet-e978c9693effffea36bc472d3aee84cb033c2f35.tar
puppet-e978c9693effffea36bc472d3aee84cb033c2f35.tar.gz
puppet-e978c9693effffea36bc472d3aee84cb033c2f35.tar.bz2
puppet-e978c9693effffea36bc472d3aee84cb033c2f35.tar.xz
puppet-e978c9693effffea36bc472d3aee84cb033c2f35.zip
- add a module to handle various websites, mainly for storing
them. - add the redirection of donate, asked by rda on sysadm ml
-rw-r--r--modules/websites/manifests/init.pp8
-rw-r--r--modules/websites/templates/vhost_donate.conf14
2 files changed, 22 insertions, 0 deletions
diff --git a/modules/websites/manifests/init.pp b/modules/websites/manifests/init.pp
new file mode 100644
index 00000000..96ae58d9
--- /dev/null
+++ b/modules/websites/manifests/init.pp
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000..c67075d0
--- /dev/null
+++ b/modules/websites/templates/vhost_donate.conf
@@ -0,0 +1,14 @@
+<VirtualHost *:80>
+ ServerName donate.<%= domain %>
+
+ RewriteEngine on
+ 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>