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 /modules | |
| 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 'modules')
| -rw-r--r-- | modules/websites/manifests/init.pp | 8 | ||||
| -rw-r--r-- | modules/websites/templates/vhost_donate.conf | 16 |
2 files changed, 0 insertions, 24 deletions
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> |