/[adm]/puppet/modules/apache/manifests/init.pp
ViewVC logotype

Diff of /puppet/modules/apache/manifests/init.pp

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

revision 1021 by dams, Fri Feb 11 18:09:46 2011 UTC revision 1065 by misc, Sun Feb 13 23:42:10 2011 UTC
# Line 6  class apache { Line 6  class apache {
6              ensure => installed              ensure => installed
7          }          }
8            
9            package { "apache-conf":
10                ensure => installed,
11            }
12    
13          service { httpd:          service { httpd:
14              alias => apache,              alias => apache,
15              ensure => running,              ensure => running,
# Line 16  class apache { Line 20  class apache {
20              ensure => present,              ensure => present,
21              path => "/etc/httpd/conf.d/customization.conf",              path => "/etc/httpd/conf.d/customization.conf",
22              content => template("apache/customization.conf"),              content => template("apache/customization.conf"),
23              require => Package["apache"],              require => Package["apache-conf"],
24              notify => Service["apache"],              notify => Service["apache"],
25              owner => root,              owner => root,
26              group => root,              group => root,
# Line 30  class apache { Line 34  class apache {
34              group => root,              group => root,
35              mode => 644,              mode => 644,
36              notify => Service['apache'],              notify => Service['apache'],
37                require => Package["apache-conf"],
38              content => template("apache/00_default_vhosts.conf")              content => template("apache/00_default_vhosts.conf")
39          }          }
40      }      }
# Line 85  class apache { Line 90  class apache {
90              owner => root,              owner => root,
91              group => root,              group => root,
92              mode => 644,              mode => 644,
93                require => Package['apache-conf'],
94              content => template('apache/mod_wsgi.conf')              content => template('apache/mod_wsgi.conf')
95          }          }
96    
# Line 141  class apache { Line 147  class apache {
147              group => root,              group => root,
148              mode => 644,              mode => 644,
149              notify => Service['apache'],              notify => Service['apache'],
150                require => Package['apache-conf'],
151              content => template("apache/vhost_base.conf")              content => template("apache/vhost_base.conf")
152          }          }
153      }      }
# Line 199  class apache { Line 206  class apache {
206              group => root,              group => root,
207              mode => 644,              mode => 644,
208              notify => Service['apache'],              notify => Service['apache'],
209                require => Package['apache-conf'],
210              content => template($vhost_file)              content => template($vhost_file)
211          }          }
212     }     }
# Line 234  class apache { Line 242  class apache {
242              group => root,              group => root,
243              mode => 644,              mode => 644,
244              notify => Service['apache'],              notify => Service['apache'],
245                require => Package['apache-conf'],
246              content => template($webapp_file)              content => template($webapp_file)
247          }          }
248     }     }
Legend:
Removed from v.1021  
changed lines
  Added in v.1065
  ViewVC Help
Powered by ViewVC 1.1.30