aboutsummaryrefslogtreecommitdiff
path: root/modules/profile/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'modules/profile/manifests')
-rw-r--r--modules/profile/manifests/monitoring.pp7
-rw-r--r--modules/profile/manifests/postgresql.pp2
-rw-r--r--modules/profile/manifests/postgresql/master.pp2
3 files changed, 9 insertions, 2 deletions
diff --git a/modules/profile/manifests/monitoring.pp b/modules/profile/manifests/monitoring.pp
index beabe70..7df4ce9 100644
--- a/modules/profile/manifests/monitoring.pp
+++ b/modules/profile/manifests/monitoring.pp
@@ -28,6 +28,13 @@ class profile::monitoring (
28 content => template("profile/monitoring/naemon.cfg.erb"), 28 content => template("profile/monitoring/naemon.cfg.erb"),
29 } 29 }
30 -> 30 ->
31 file { "/etc/naemon/objects.cfg":
32 ensure => "file",
33 owner => "naemon",
34 group => "naemon",
35 mode => "0600"
36 }
37 ->
31 service { "naemon": 38 service { "naemon":
32 ensure => "running", 39 ensure => "running",
33 enable => true, 40 enable => true,
diff --git a/modules/profile/manifests/postgresql.pp b/modules/profile/manifests/postgresql.pp
index edd6ea6..fedbcb1 100644
--- a/modules/profile/manifests/postgresql.pp
+++ b/modules/profile/manifests/postgresql.pp
@@ -30,7 +30,7 @@ class profile::postgresql (
30 30
31 @profile::monitoring::local_service { "Databases are present in postgresql": 31 @profile::monitoring::local_service { "Databases are present in postgresql":
32 sudos => { 32 sudos => {
33 "naemon-postgresql-database-public" => "naemon ALL=(postgres) NOPASSWD: /usr/bin/psql -c select\ nspname\ from\ pg_catalog.pg_namespace" 33 "naemon-postgresql-database-public" => "naemon ALL=(postgres) NOPASSWD: /usr/bin/psql -c select\\ nspname\\ from\\ pg_catalog.pg_namespace"
34 }, 34 },
35 local => { 35 local => {
36 check_command => "check_command_output!psql -c 'select nspname from pg_catalog.pg_namespace'!public!-r postgres", 36 check_command => "check_command_output!psql -c 'select nspname from pg_catalog.pg_namespace'!public!-r postgres",
diff --git a/modules/profile/manifests/postgresql/master.pp b/modules/profile/manifests/postgresql/master.pp
index e775eb4..99ac4c4 100644
--- a/modules/profile/manifests/postgresql/master.pp
+++ b/modules/profile/manifests/postgresql/master.pp
@@ -66,7 +66,7 @@ define profile::postgresql::master (
66 66
67 }, 67 },
68 local => { 68 local => {
69 check_command => "check_postgresql_replication!$backup_host!/run/postgresql/!5432", 69 check_command => "check_postgresql_replication!$backup_host!/run/postgresql!5432",
70 } 70 }
71 } 71 }
72 } 72 }