Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/nagios/manifests/server.pp

Issue 11694009: Fix order of resources (Closed)
Patch Set: Created Sept. 12, 2013, 1:36 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 class nagios::server($vhost, $htpasswd_source, $admins) { 1 class nagios::server($vhost, $htpasswd_source, $admins) {
2 File { 2 File {
3 owner => 'root', 3 owner => 'root',
4 group => 'root', 4 group => 'root',
5 mode => 0644 5 mode => 0644
6 } 6 }
7 7
8 include nginx, 'spawn-fcgi' 8 include nginx, 'spawn-fcgi'
9 9
10 package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi', 10 package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 service {'nagios3': 51 service {'nagios3':
52 ensure => running, 52 ensure => running,
53 enable => true, 53 enable => true,
54 require => [Package['nagios3'], Package['pnp4nagios']] 54 require => [Package['nagios3'], Package['pnp4nagios']]
55 } 55 }
56 56
57 service {'apache2': 57 service {'apache2':
58 ensure => stopped, 58 ensure => stopped,
59 enable => false, 59 enable => false,
60 require => Package['nagios3'],
60 before => Service['nagios3'] 61 before => Service['nagios3']
61 } 62 }
62 63
63 file {'/etc/nagios3/htpasswd.users': 64 file {'/etc/nagios3/htpasswd.users':
64 source => $htpasswd_source 65 source => $htpasswd_source,
66 require => Package['nagios3']
65 } 67 }
66 68
67 file {'/etc/nagios3/cgi.cfg': 69 file {'/etc/nagios3/cgi.cfg':
68 content => template('nagios/cgi.cfg.erb'), 70 content => template('nagios/cgi.cfg.erb'),
69 require => Package['nagios3'], 71 require => Package['nagios3'],
70 notify => Service['nagios3'] 72 notify => Service['nagios3']
71 } 73 }
72 74
73 file {'/etc/nagios3/nagios.cfg': 75 file {'/etc/nagios3/nagios.cfg':
74 source => 'puppet:///modules/nagios/nagios.cfg', 76 source => 'puppet:///modules/nagios/nagios.cfg',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 file {['/etc/nagios3/conf.d/contacts.cfg', 145 file {['/etc/nagios3/conf.d/contacts.cfg',
144 '/etc/nagios3/conf.d/contactgroups.cfg', 146 '/etc/nagios3/conf.d/contactgroups.cfg',
145 '/etc/nagios3/conf.d/commands.cfg', 147 '/etc/nagios3/conf.d/commands.cfg',
146 '/etc/nagios3/conf.d/hosts.cfg', 148 '/etc/nagios3/conf.d/hosts.cfg',
147 '/etc/nagios3/conf.d/hostgroups.cfg', 149 '/etc/nagios3/conf.d/hostgroups.cfg',
148 '/etc/nagios3/conf.d/services.cfg']: 150 '/etc/nagios3/conf.d/services.cfg']:
149 require => Package['nagios3'], 151 require => Package['nagios3'],
150 notify => Service['nagios3'] 152 notify => Service['nagios3']
151 } 153 }
152 } 154 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld