diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-12-20 13:53:49 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-12-20 13:53:49 +0000 |
| commit | 3cbee6d6bada1fcb3a58972a449f4b107a24ec70 (patch) | |
| tree | 3b2e4b09dd04e11d2fc9f648acec6049e2f8a953 /deployment/websites | |
| parent | 51172bbf3b5bf8a4d72c2b7d032da472b4e290a8 (diff) | |
| download | puppet-3cbee6d6bada1fcb3a58972a449f4b107a24ec70.tar puppet-3cbee6d6bada1fcb3a58972a449f4b107a24ec70.tar.gz puppet-3cbee6d6bada1fcb3a58972a449f4b107a24ec70.tar.bz2 puppet-3cbee6d6bada1fcb3a58972a449f4b107a24ec70.tar.xz puppet-3cbee6d6bada1fcb3a58972a449f4b107a24ec70.zip | |
add mageia website on www-test.mageia.org on champagne
Diffstat (limited to 'deployment/websites')
| -rw-r--r-- | deployment/websites/manifests/init.pp | 19 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_www.conf | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/deployment/websites/manifests/init.pp b/deployment/websites/manifests/init.pp index d2119224..644bd11e 100644 --- a/deployment/websites/manifests/init.pp +++ b/deployment/websites/manifests/init.pp @@ -21,6 +21,25 @@ class websites { } } + class www inherits base { + include apache::mod_php + include apache::mod_geoip + $vhostdir = "$webdatadir/www.$domain" + $svn_location = "svn://svn.$domain/svn/web/www/trunk" + + subversion::snapshot { $vhostdir: + source => $svn_location + } + + apache::vhost_base { "www-test.$domain": + content => template('websites/vhost_www.conf'), + } + + package { ['php-mbstring', 'php-mcrypt', 'php-gettext']: + ensure => "installed", + } + } + class hugs inherits base { $vhostdir = "$webdatadir/hugs.$domain" $svn_location = "svn://svn.$domain/svn/web/hugs/public/" diff --git a/deployment/websites/templates/vhost_www.conf b/deployment/websites/templates/vhost_www.conf new file mode 100644 index 00000000..622f1bb0 --- /dev/null +++ b/deployment/websites/templates/vhost_www.conf @@ -0,0 +1,2 @@ +Redirect /mailman http://blog.mageia.org/en/2011/12/19/server-outage/ +Redirect /wiki https://wiki.mageia.org/ |