diff options
author | Michael Scherer <misc@mageia.org> | 2012-03-17 16:53:29 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-03-17 16:53:29 +0000 |
commit | bf5cfb99efadbd61e75a33011516a1a0f67f4b98 (patch) | |
tree | 995bea057cb7fd5a7a8a8c5bc24a9caa12aeb94d /deployment/websites | |
parent | 5dfbd4ea5e59de50c6d119973bd3221b1e593a86 (diff) | |
download | puppet-bf5cfb99efadbd61e75a33011516a1a0f67f4b98.tar puppet-bf5cfb99efadbd61e75a33011516a1a0f67f4b98.tar.gz puppet-bf5cfb99efadbd61e75a33011516a1a0f67f4b98.tar.bz2 puppet-bf5cfb99efadbd61e75a33011516a1a0f67f4b98.tar.xz puppet-bf5cfb99efadbd61e75a33011516a1a0f67f4b98.zip |
clean the module from puppet-lint error, and make sure scoping is properly used
for fact. Do not hardcode the distro name either.
Diffstat (limited to 'deployment/websites')
-rw-r--r-- | deployment/websites/manifests/www.pp | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp index b42d4c2c..aa255e27 100644 --- a/deployment/websites/manifests/www.pp +++ b/deployment/websites/manifests/www.pp @@ -1,51 +1,51 @@ -class websites { - class www inherits base { - $vhost = "www.$domain" - $vhostdir = "$webdatadir/www.$domain" - $svn_location = "svn://svn.$domain/svn/web/www/trunk" - - include apache::mod_php - include apache::mod_geoip - - # for mailman reverse proxy, on ssl - include apache::mod_proxy - include apache::mod_ssl - - subversion::snapshot { $vhostdir: - source => $svn_location, - } - - file { "$vhostdir/var/tmp/cache": - ensure => directory, - owner => root, - group => $apache::base::apache_group, - mode => 0660, - } - - apache::vhost_base { "$vhost": - content => template('websites/vhost_www.conf', "websites/vhost_proxy_mailman.conf"), - location => $vhostdir, - options => ['FollowSymLinks'], - } - - apache::vhost_base { "ssl_$vhost": - use_ssl => true, - vhost => $vhost, - content => template('websites/vhost_www.conf', "websites/vhost_proxy_mailman_ssl.conf"), - location => $vhostdir, - 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', 'php-geoip']: } +class websites::www { + include websites::base + $vhost = "www.$::domain" + $vhostdir = "$websites::base::webdatadir/$vhost" + $svn_location = "svn://svn.$::domain/svn/web/www/trunk" + + include apache::mod_php + include apache::mod_geoip + + # for mailman reverse proxy, on ssl + include apache::mod_proxy + include apache::mod_ssl + + subversion::snapshot { $vhostdir: + source => $svn_location, + } + + file { "$vhostdir/var/tmp/cache": + ensure => directory, + group => $apache::base::apache_group, + mode => '0660', + } + + $mailman_content = template('websites/vhost_www.conf', + 'websites/vhost_proxy_mailman.conf') + apache::vhost_base { $vhost: + content => $mailman_content, + location => $vhostdir, + options => ['FollowSymLinks'], } + + apache::vhost_base { "ssl_$vhost": + use_ssl => true, + vhost => $vhost, + content => $mailman_content, + location => $vhostdir, + options => ['FollowSymLinks'], + } + + apache::vhost_redirect { $::domain: + url => "http://www.$::domain/", + } + + apache::vhost_redirect { "ssl_$::domain": + use_ssl => true, + vhost => $::domain, + url => "https://www.$::domain/", + } + + package { ['php-mbstring', 'php-mcrypt', 'php-gettext', 'php-geoip']: } } |