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

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

Issue 29448574: Noissue - Use of spawn_fcgi module instead of spawn-fcgi (Closed)
Patch Set: Created May 25, 2017, 4:55 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 | « modules/downloadserver/manifests/init.pp ('k') | modules/notificationserver/manifests/init.pp » ('j') | 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( 1 class nagios::server(
2 $domain, 2 $domain,
3 $certificate, 3 $certificate,
4 $private_key, 4 $private_key,
5 $is_default=false, 5 $is_default=false,
6 $htpasswd_source, 6 $htpasswd_source,
7 $admins, 7 $admins,
8 $zone, 8 $zone,
9 $contacts = hiera('nagios::server::contacts', {}), 9 $contacts = hiera('nagios::server::contacts', {}),
10 $contactgroups = hiera('nagios::server::contactgroups', {}), 10 $contactgroups = hiera('nagios::server::contactgroups', {}),
11 $commands = hiera('nagios::server::commands', {}), 11 $commands = hiera('nagios::server::commands', {}),
12 $services = hiera('nagios::server::services', {}), 12 $services = hiera('nagios::server::services', {}),
13 $hosts = hiera('nagios::server::hosts', {}), 13 $hosts = hiera('nagios::server::hosts', {}),
14 $hostgroups = hiera('nagios::server::hostgroups', {}), 14 $hostgroups = hiera('nagios::server::hostgroups', {}),
15 ) { 15 ) {
16 16
17 File { 17 File {
18 owner => 'root', 18 owner => 'root',
19 group => 'root', 19 group => 'root',
20 mode => 0644 20 mode => 0644
21 } 21 }
22 22
23 include nginx, 'spawn-fcgi' 23 include nginx
24 include spawn_fcgi
24 25
25 package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi', 26 package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi',
26 'fcgiwrap', 'pnp4nagios']: 27 'fcgiwrap', 'pnp4nagios']:
27 ensure => present 28 ensure => present
28 } 29 }
29 30
30 if $::operatingsystem == 'Debian' { 31 if $::operatingsystem == 'Debian' {
31 class { 'apt::backports': 32 class { 'apt::backports':
32 release => 'jessie', 33 release => 'jessie',
33 location => 'http://ftp.debian.org/debian', 34 location => 'http://ftp.debian.org/debian',
34 } 35 }
35 } 36 }
36 37
37 nginx::hostconfig{$domain: 38 nginx::hostconfig{$domain:
38 source => 'puppet:///modules/nagios/site.conf', 39 source => 'puppet:///modules/nagios/site.conf',
39 is_default => $is_default, 40 is_default => $is_default,
40 certificate => $certificate, 41 certificate => $certificate,
41 private_key => $private_key, 42 private_key => $private_key,
42 log => 'access_log_monitoring' 43 log => 'access_log_monitoring'
43 } 44 }
44 45
45 spawn-fcgi::php-pool {'global': 46 spawn_fcgi::php_pool {'global':
46 ensure => present, 47 ensure => present,
47 socket => '/tmp/php-fastcgi.sock', 48 socket => '/tmp/php-fastcgi.sock',
48 children => '3', 49 children => '3',
49 require => Package['php5-cgi'] 50 require => Package['php5-cgi']
50 } 51 }
51 52
52 service {'nagios3': 53 service {'nagios3':
53 ensure => running, 54 ensure => running,
54 enable => true, 55 enable => true,
55 require => [Package['nagios3'], Package['pnp4nagios']] 56 require => [Package['nagios3'], Package['pnp4nagios']]
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 notify => Service['nagios3'] 161 notify => Service['nagios3']
161 } 162 }
162 163
163 create_resources(nagios_contact, $contacts) 164 create_resources(nagios_contact, $contacts)
164 create_resources(nagios_contactgroup, $contactgroups) 165 create_resources(nagios_contactgroup, $contactgroups)
165 create_resources(nagios_command, $commands) 166 create_resources(nagios_command, $commands)
166 create_resources(nagios_service, $services) 167 create_resources(nagios_service, $services)
167 create_resources(nagios_host, $hosts) 168 create_resources(nagios_host, $hosts)
168 create_resources(nagios_hostgroup, $hostgroups) 169 create_resources(nagios_hostgroup, $hostgroups)
169 } 170 }
OLDNEW
« no previous file with comments | « modules/downloadserver/manifests/init.pp ('k') | modules/notificationserver/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld