summaryrefslogtreecommitdiff
path: root/manifests/agent
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-07-15 09:27:27 +0200
committervarac <varacanero@zeromail.org>2013-07-15 09:27:27 +0200
commit80322f255030846d27a2997807046fdbe1ffbb2a (patch)
tree3e4c1f94ae0b3c4e50b129fdef488448ebd981a9 /manifests/agent
parent06fc5e7cd019a4b6badc8ed074bac58e7c91b930 (diff)
ssh support for agent
Diffstat (limited to 'manifests/agent')
-rw-r--r--manifests/agent/config.pp35
-rw-r--r--manifests/agent/generate_sshkey.pp42
2 files changed, 63 insertions, 14 deletions
diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
index dc6808a..c73341f 100644
--- a/manifests/agent/config.pp
+++ b/manifests/agent/config.pp
@@ -4,6 +4,7 @@ class check_mk::agent::config (
$server_dir,
$use_cache,
$user,
+ $use_ssh = false
) {
if $use_cache {
$server = "${server_dir}/check_mk_caching_agent"
@@ -11,19 +12,25 @@ class check_mk::agent::config (
else {
$server = "${server_dir}/check_mk_agent"
}
- if $ip_whitelist {
- $only_from = join($ip_whitelist, ' ')
- }
- else {
- $only_from = undef
- }
- file { '/etc/xinetd.d/check_mk':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0444',
- content => template('check_mk/agent/check_mk.erb'),
- require => Package['check_mk-agent','check_mk-agent-logwatch'],
- notify => Class['check_mk::agent::service'],
+
+ if ( $use_ssh == true ){
+ check_mk::agent::generate_sshkey { 'check_mk_key': }
+ } else {
+
+ if $ip_whitelist {
+ $only_from = join($ip_whitelist, ' ')
+ }
+ else {
+ $only_from = undef
+ }
+ file { '/etc/xinetd.d/check_mk':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('check_mk/agent/check_mk.erb'),
+ require => Package['check_mk-agent','check_mk-agent-logwatch'],
+ notify => Class['check_mk::agent::service'],
+ }
}
}
diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp
new file mode 100644
index 0000000..72dcb25
--- /dev/null
+++ b/manifests/agent/generate_sshkey.pp
@@ -0,0 +1,42 @@
+define check_mk::agent::client::generate_sshkey(
+ $ssh_key_basepath = '/etc/puppet/modules/keys/files/check_mk_keys',
+ $user = 'monitoring',
+ $group = 'monitoring',
+ $homedir = '/omd/sites/monitoring',
+ $check_mk_tag = 'check_mk_sshkey'
+){
+
+ # generate backupninja ssh keypair
+ $ssh_key_name = "monitoring_${::fqdn}_id_rsa"
+ $ssh_keys = ssh_keygen("${ssh_key_basepath}/${ssh_key_name}")
+ $public = split($ssh_keys[1],' ')
+ $public_type = $public[0]
+ $public_key = $public[1]
+ $secret_key = $ssh_keys[0]
+
+ sshd::ssh_authorized_key { $ssh_key_name:
+ type => 'ssh-rsa',
+ key => $public_key,
+ user => 'root',
+ options => 'command="/usr/bin/check_mk_agent"';
+ }
+
+ @@file { "${homedir}/.ssh/${ssh_key_name}":
+ content => $secret_key,
+ owner => $user,
+ group => $group,
+ mode => '0600',
+ tag => $check_mk_tag;
+ }
+
+
+ @@file { "${homedir}/.ssh/${ssh_key_name}.pub":
+ content => $public_key,
+ owner => $user,
+ group => $group,
+ mode => '0666',
+ tag => $check_mk_tag;
+ }
+
+
+}