/[adm]/puppet/deployment/websites/manifests/www.pp
ViewVC logotype

Diff of /puppet/deployment/websites/manifests/www.pp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2465 by pterjan, Tue Feb 21 18:34:40 2012 UTC revision 2578 by misc, Sat Mar 17 16:53:29 2012 UTC
# Line 1  Line 1 
1  class websites {  class websites::www {
2      class www inherits base {      include websites::base
3          $vhost = "www.$domain"      $vhost = "www.$::domain"
4          $vhostdir = "$webdatadir/www.$domain"      $vhostdir = "$websites::base::webdatadir/$vhost"
5          $svn_location = "svn://svn.$domain/svn/web/www/trunk"      $svn_location = "svn://svn.$::domain/svn/web/www/trunk"
6    
7          include apache::mod_php      include apache::mod_php
8          include apache::mod_geoip      include apache::mod_geoip
9    
10          # for mailman reverse proxy, on ssl      # for mailman reverse proxy, on ssl
11          include apache::mod_proxy      include apache::mod_proxy
12          include apache::mod_ssl      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/',  
         }  
13    
14          package { ['php-mbstring', 'php-mcrypt', 'php-gettext', 'php-geoip']: }      subversion::snapshot { $vhostdir:
15            source => $svn_location,
16      }      }
17    
18        file { "$vhostdir/var/tmp/cache":
19            ensure => directory,
20            group  => $apache::base::apache_group,
21            mode   => '0660',
22        }
23    
24        $mailman_content = template('websites/vhost_www.conf',
25                                    'websites/vhost_proxy_mailman.conf')
26        apache::vhost_base { $vhost:
27            content  => $mailman_content,
28            location => $vhostdir,
29            options  => ['FollowSymLinks'],
30        }
31    
32        apache::vhost_base { "ssl_$vhost":
33            use_ssl  => true,
34            vhost    => $vhost,
35            content  => $mailman_content,
36            location => $vhostdir,
37            options  => ['FollowSymLinks'],
38        }
39    
40        apache::vhost_redirect { $::domain:
41            url => "http://www.$::domain/",
42        }
43    
44        apache::vhost_redirect { "ssl_$::domain":
45            use_ssl => true,
46            vhost   => $::domain,
47            url     => "https://www.$::domain/",
48        }
49    
50        package { ['php-mbstring', 'php-mcrypt', 'php-gettext', 'php-geoip']: }
51  }  }

Legend:
Removed from v.2465  
changed lines
  Added in v.2578

  ViewVC Help
Powered by ViewVC 1.1.30