diff options
| author | Michael Scherer <misc@mageia.org> | 2011-01-09 11:15:15 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-01-09 11:15:15 +0000 |
| commit | 9cd1b1d64013e982370d18ab5daeae0501c4dc3a (patch) | |
| tree | e48f9c8a41be64a5770bd7ac94fe443f4ae05ff7 /deployment/websites | |
| parent | 12e4ffac877d70561885d4b02f33544a9b00906f (diff) | |
| download | puppet-9cd1b1d64013e982370d18ab5daeae0501c4dc3a.tar puppet-9cd1b1d64013e982370d18ab5daeae0501c4dc3a.tar.gz puppet-9cd1b1d64013e982370d18ab5daeae0501c4dc3a.tar.bz2 puppet-9cd1b1d64013e982370d18ab5daeae0501c4dc3a.tar.xz puppet-9cd1b1d64013e982370d18ab5daeae0501c4dc3a.zip | |
move websites module to deployment
Diffstat (limited to 'deployment/websites')
| -rw-r--r-- | deployment/websites/manifests/init.pp | 8 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_donate.conf | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/deployment/websites/manifests/init.pp b/deployment/websites/manifests/init.pp new file mode 100644 index 00000000..96ae58d9 --- /dev/null +++ b/deployment/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/deployment/websites/templates/vhost_donate.conf b/deployment/websites/templates/vhost_donate.conf new file mode 100644 index 00000000..c2f5c551 --- /dev/null +++ b/deployment/websites/templates/vhost_donate.conf @@ -0,0 +1,16 @@ +<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> |