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

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

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

revision 2109 by boklm, Tue Dec 20 14:41:10 2011 UTC revision 2110 by boklm, Tue Dec 20 15:16:14 2011 UTC
# Line 24  class websites { Line 24  class websites {
24      class www inherits base {      class www inherits base {
25          include apache::mod_php          include apache::mod_php
26          include apache::mod_geoip          include apache::mod_geoip
27          $vhost = "www-test.$domain"          $vhost = "www.$domain"
28          $vhostdir = "$webdatadir/www.$domain"          $vhostdir = "$webdatadir/www.$domain"
29          $svn_location = "svn://svn.$domain/svn/web/www/trunk"          $svn_location = "svn://svn.$domain/svn/web/www/trunk"
30    
# Line 52  class websites { Line 52  class websites {
52              options => ['FollowSymLinks'],              options => ['FollowSymLinks'],
53          }          }
54    
55            apache::vhost_redirect { $domain:
56                url => 'http://www.mageia.org/',
57            }
58            apache::vhost_redirect { "ssl_$domain":
59                use_ssl => true,
60                vhost => $domain,
61                url => 'https://www.mageia.org/',
62            }
63    
64          package { ['php-mbstring', 'php-mcrypt', 'php-gettext']:          package { ['php-mbstring', 'php-mcrypt', 'php-gettext']:
65              ensure => "installed",              ensure => "installed",
66          }          }
# Line 92  class websites { Line 101  class websites {
101          }          }
102      }      }
103    
     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/#'  
         }  
     }  
   
104      class svn {      class svn {
105          apache::vhost_redirect { "svn.$domain":          apache::vhost_redirect { "svn.$domain":
106              url => "http://svnweb.$domain/",              url => "http://svnweb.$domain/",
Legend:
Removed from v.2109  
changed lines
  Added in v.2110
  ViewVC Help
Powered by ViewVC 1.1.30