| Index: modules/nagios/manifests/server.pp |
| =================================================================== |
| --- a/modules/nagios/manifests/server.pp |
| +++ b/modules/nagios/manifests/server.pp |
| @@ -1,27 +1,35 @@ |
| -class nagios::server($domain, $is_default=false, $htpasswd_source, $admins) { |
| +class nagios::server( |
| + $domain, |
| + $certificate, |
| + $private_key, |
| + $is_default=false, |
| + $htpasswd_source, |
| + $admins |
| + ) { |
| + |
| File { |
| owner => 'root', |
| group => 'root', |
| mode => 0644 |
| } |
| include nginx, 'spawn-fcgi' |
| package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi', |
| 'fcgiwrap', 'pnp4nagios']: |
| ensure => present |
| } |
| nginx::hostconfig{$domain: |
| source => 'puppet:///modules/nagios/site.conf', |
| is_default => $is_default, |
| - certificate => 'adblockplus.org_sslcert.pem', |
| - private_key => 'adblockplus.org_sslcert.key', |
| + certificate => $certificate, |
| + private_key => $private_key, |
| log => 'access_log_monitoring' |
| } |
| spawn-fcgi::php-pool {'global': |
| ensure => present, |
| socket => '/tmp/php-fastcgi.sock', |
| children => '3' |
| } |