Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Puppetlabs apache dependency #11

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Puppetlabs apache dependency #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
816f9f2
Completely removed dependencies from apache (for now!)
Nov 21, 2013
ac61058
changed some default client values (to make remote checks work)
Nov 21, 2013
bdb5ef0
Merge branch 'remote_checks'
Nov 21, 2013
449826d
All apache_httpd dependencies put under a single conditional
Nov 21, 2013
c25d276
Added SSL configuration with puppetlabs-apache (bit bogus for now)
Nov 22, 2013
23dff3c
Fixed imporing puppetlabs-apache from nagios server, simple auth
Nov 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/client.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
class nagios::client (
$nagios_host_name = $::nagios_host_name,
$nagios_server = $::nagios_server,
$nagios_server = 'default',
# nrpe.cfg
$nrpe_log_facility = 'daemon',
$nrpe_pid_file = $nagios::params::nrpe_pid_file,
Expand All @@ -23,7 +23,7 @@
$host_check_period = $::nagios_host_check_period,
$host_check_command = $::nagios_host_check_command,
$host_contact_groups = $::nagios_host_contact_groups,
$host_hostgroups = $::nagios_host_hostgroups,
$host_hostgroups = undef,
$host_notes = $::nagios_host_notes,
$host_notes_url = $::nagios_host_notes_url,
$host_notification_period = $::nagios_host_notification_period,
Expand Down
3 changes: 3 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,8 @@
}
}

# This probably needs specialization per OS (needs the final /)
$cgi_dir = "/usr/${libdir}/nagios/cgi-bin/"
$html_dir = "/usr/share/nagios/html/"
}

90 changes: 68 additions & 22 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
class nagios::server (
# For the tag of the stored configuration to realize
$nagios_server = 'default',
$puppetlabs_apache = false,
$apache_httpd = true,
$apache_httpd_ssl = true,
$apache_httpd_modules = [
Expand All @@ -18,7 +19,7 @@
],
# The apache config snippet, more useful as a template when using a custom
$apache_httpd_conf_content = template('nagios/apache_httpd/httpd-nagios.conf.erb'),
$apache_allowed_from = [], # Allow access to the web in the previous template
$apache_allowed_from = '127.0.0.1', # Allow access to the web in the previous template
$apache_httpd_htpasswd_source = "puppet:///modules/${module_name}/apache_httpd/htpasswd",
$php = true,
$php_apc = true,
Expand Down Expand Up @@ -150,24 +151,8 @@
require => Package['nagios'],
}

file { '/etc/httpd/conf.d/nagios.conf':
owner => 'root',
group => 'root',
mode => '0644',
content => $apache_httpd_conf_content,
notify => Service['httpd'],
require => Package['nagios'],
}
if $apache_httpd_htpasswd_source != false {
file { '/etc/nagios/.htpasswd':
owner => 'root',
group => 'apache',
mode => '0640',
source => $apache_httpd_htpasswd_source,
require => Package['nagios'],
}
}

# Configure apache with apache_httpd module only if requested
if $apache_httpd {
require apache_httpd::install
require apache_httpd::service::ssl
Expand All @@ -176,14 +161,75 @@
modules => $apache_httpd_modules,
keepalive => 'On',
}

file { '/etc/httpd/conf.d/nagios.conf':
owner => 'root',
group => 'root',
mode => '0644',
content => $apache_httpd_conf_content,
notify => Service['httpd'],
require => Package['nagios'],
}

if $apache_httpd_htpasswd_source != false {
file { '/etc/nagios/.htpasswd':
owner => 'root',
group => 'apache',
mode => '0640',
source => $apache_httpd_htpasswd_source,
require => Package['nagios'],
}
}

if $php {
include php::mod_php5
php::ini { '/etc/php.ini': }
if $php_apc { php::module { 'pecl-apc': } }
}
}

if $php {
include php::mod_php5
php::ini { '/etc/php.ini': }
if $php_apc { php::module { 'pecl-apc': } }
# Configure apache with puppetlabs-apache module only if requested
if $puppetlabs_apache {
#class {'apache': default_vhost => false, default_ssl_vhost => false}
include apache
include apache::mod::php
include apache::mod::ssl
apache::vhost { 'nagios':
port => 443,
ssl => true,
docroot => $nagios::params::html_dir,
# Avoided scriptaliases because they will go AFTER the aliases and therefore not work
aliases => [
{ alias => '/nagios/cgi-bin/', path => $nagios::params::cgi_dir },
{ alias => '/nagios/', path => $nagios::params::html_dir }
],
directories => [
{ path => $nagios::params::cgi_dir,
'addhandlers' => [{ handler => 'cgi-script', extensions => ['.cgi']}],
'options' => 'ExecCGI',
'order' => 'Deny,Allow',
'deny' => 'from all',
'allow' => "from ${apache_allowed_from}",
'auth_type' => 'Basic',
'auth_user_file' => '/etc/nagios/.htpasswd',
'auth_name' => 'Nagios',
'auth_require' => 'valid-user',
} , {
path => $nagios::params::html_dir,
'options' => 'FollowSymlinks',
'order' => 'Deny,Allow',
'deny' => 'from all',
'allow' => "from ${apache_allowed_from}",
'auth_type' => 'Basic',
'auth_user_file' => '/etc/nagios/.htpasswd',
'auth_name' => 'Nagios',
'auth_require' => 'valid-user',
}
], # end directories
} # end vhost
}


# Configuration files
file { '/etc/nagios/cgi.cfg':
owner => 'root',
Expand Down
14 changes: 2 additions & 12 deletions templates/apache_httpd/httpd-nagios.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ ScriptAlias /nagios/cgi-bin/ /usr/<%= scope.lookupvar("nagios::params::libdir")
Options ExecCGI
Order Deny,Allow
Deny from all
Allow from 127.0.0.1
<% if @apache_allowed_from -%>
<% @apache_allowed_from.each do |val| -%>
Allow from <%= val %>
<% end -%>
<% end -%>
Allow from <%= @apache_allowed_from %>
AuthType Basic
AuthUserFile /etc/nagios/.htpasswd
AuthName "Nagios"
Expand All @@ -20,12 +15,7 @@ Alias /nagios/ /usr/share/nagios/html/
Options FollowSymlinks
Order Deny,Allow
Deny from all
Allow from 127.0.0.1
<% if @apache_allowed_from -%>
<% @apache_allowed_from.each do |val| -%>
Allow from <%= val %>
<% end -%>
<% end -%>
Allow from <%= @apache_allowed_from %>
AuthType Basic
AuthUserFile /etc/nagios/.htpasswd
AuthName "Nagios"
Expand Down