diff options
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/websites/manifests/init.pp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/deployment/websites/manifests/init.pp b/deployment/websites/manifests/init.pp index 064e7b16..548397d2 100644 --- a/deployment/websites/manifests/init.pp +++ b/deployment/websites/manifests/init.pp @@ -24,7 +24,7 @@ class websites { class www inherits base { include apache::mod_php include apache::mod_geoip - $vhost = "www-test.$domain" + $vhost = "www.$domain" $vhostdir = "$webdatadir/www.$domain" $svn_location = "svn://svn.$domain/svn/web/www/trunk" @@ -52,6 +52,15 @@ class websites { options => ['FollowSymLinks'], } + apache::vhost_redirect { $domain: + url => 'http://www.mageia.org/', + } + apache::vhost_redirect { "ssl_$domain": + use_ssl => true, + vhost => $domain, + url => 'https://www.mageia.org/', + } + package { ['php-mbstring', 'php-mcrypt', 'php-gettext']: ensure => "installed", } @@ -92,15 +101,6 @@ class websites { } } - class www_outage { - apache::vhost_redirect { "www.$domain": - url => 'http://blog.mageia.org/en/2011/12/19/server-outage/#' - } - apache::vhost_redirect { "$domain": - url => 'http://blog.mageia.org/en/2011/12/19/server-outage/#' - } - } - class svn { apache::vhost_redirect { "svn.$domain": url => "http://svnweb.$domain/", |