diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-12-20 15:16:14 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-12-20 15:16:14 +0000 |
| commit | 5d7328b219a766154ad9c0b5f90c56ceb0d0e714 (patch) | |
| tree | 9a85ec7ce6f9989085919b742f9565527fdf919e | |
| parent | 78e403d57b0a68bd8c58ba22693c11f2396832ae (diff) | |
| download | puppet-5d7328b219a766154ad9c0b5f90c56ceb0d0e714.tar puppet-5d7328b219a766154ad9c0b5f90c56ceb0d0e714.tar.gz puppet-5d7328b219a766154ad9c0b5f90c56ceb0d0e714.tar.bz2 puppet-5d7328b219a766154ad9c0b5f90c56ceb0d0e714.tar.xz puppet-5d7328b219a766154ad9c0b5f90c56ceb0d0e714.zip | |
remove www_outage redirection and setup mageia website on champagne
| -rw-r--r-- | deployment/websites/manifests/init.pp | 20 | ||||
| -rw-r--r-- | manifests/nodes.pp | 1 |
2 files changed, 10 insertions, 11 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/", diff --git a/manifests/nodes.pp b/manifests/nodes.pp index e2084e96..3666decc 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -199,7 +199,6 @@ node champagne { include websites::static include websites::hugs include websites::releases - include websites::www_outage include websites::www include dashboard::base include access_classes::web |