diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-07-11 12:41:36 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-07-11 12:41:36 +0200 |
commit | 625907f0177d335c05c05ae66ae49e20287d14b0 (patch) | |
tree | e5c4118c42401206ff12a2f1a2b6a537c51922de /modules/role | |
parent | e5cc123b5d9d871cf20ea947df9352a54a007b7b (diff) | |
parent | 21d531ee2e4a5952673d694342ff01822581a1f8 (diff) | |
download | Puppet-625907f0177d335c05c05ae66ae49e20287d14b0.tar.gz Puppet-625907f0177d335c05c05ae66ae49e20287d14b0.tar.zst Puppet-625907f0177d335c05c05ae66ae49e20287d14b0.zip |
Merge branch 'dev'
Diffstat (limited to 'modules/role')
-rw-r--r-- | modules/role/manifests/backup.pp | 7 | ||||
-rw-r--r-- | modules/role/manifests/caldance.pp | 1 | ||||
-rw-r--r-- | modules/role/manifests/cryptoportfolio.pp | 2 | ||||
-rw-r--r-- | modules/role/manifests/etherpad.pp | 14 |
4 files changed, 23 insertions, 1 deletions
diff --git a/modules/role/manifests/backup.pp b/modules/role/manifests/backup.pp index b35c542..6b8d00c 100644 --- a/modules/role/manifests/backup.pp +++ b/modules/role/manifests/backup.pp | |||
@@ -14,6 +14,7 @@ class role::backup ( | |||
14 | include "profile::xmr_stak" | 14 | include "profile::xmr_stak" |
15 | include "profile::known_hosts" | 15 | include "profile::known_hosts" |
16 | include "profile::boinc" | 16 | include "profile::boinc" |
17 | include "profile::monitoring" | ||
17 | 18 | ||
18 | include "role::backup::postgresql" | 19 | include "role::backup::postgresql" |
19 | 20 | ||
@@ -124,5 +125,11 @@ class role::backup ( | |||
124 | order => "$order_dirname-$order_part", | 125 | order => "$order_dirname-$order_part", |
125 | } | 126 | } |
126 | } | 127 | } |
128 | |||
129 | @profile::monitoring::local_service { "Last backup in $base is not too old": | ||
130 | local => { | ||
131 | check_command => "check_last_file_date!$base!14", | ||
132 | } | ||
133 | } | ||
127 | } | 134 | } |
128 | } | 135 | } |
diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp index 75d9dbd..b7948e6 100644 --- a/modules/role/manifests/caldance.pp +++ b/modules/role/manifests/caldance.pp | |||
@@ -6,6 +6,7 @@ class role::caldance ( | |||
6 | include "profile::postgresql" | 6 | include "profile::postgresql" |
7 | include "profile::apache" | 7 | include "profile::apache" |
8 | include "profile::redis" | 8 | include "profile::redis" |
9 | include "profile::monitoring" | ||
9 | 10 | ||
10 | ensure_packages(["python-pip", "python-virtualenv", "python-django"]) | 11 | ensure_packages(["python-pip", "python-virtualenv", "python-django"]) |
11 | } | 12 | } |
diff --git a/modules/role/manifests/cryptoportfolio.pp b/modules/role/manifests/cryptoportfolio.pp index c675e91..1738685 100644 --- a/modules/role/manifests/cryptoportfolio.pp +++ b/modules/role/manifests/cryptoportfolio.pp | |||
@@ -28,6 +28,7 @@ class role::cryptoportfolio ( | |||
28 | include "profile::apache" | 28 | include "profile::apache" |
29 | include "profile::xmr_stak" | 29 | include "profile::xmr_stak" |
30 | include "profile::boinc" | 30 | include "profile::boinc" |
31 | include "profile::monitoring" | ||
31 | 32 | ||
32 | contain "role::cryptoportfolio::postgresql" | 33 | contain "role::cryptoportfolio::postgresql" |
33 | contain "role::cryptoportfolio::apache" | 34 | contain "role::cryptoportfolio::apache" |
@@ -41,7 +42,6 @@ class role::cryptoportfolio ( | |||
41 | contain "role::cryptoportfolio::bot" | 42 | contain "role::cryptoportfolio::bot" |
42 | } | 43 | } |
43 | 44 | ||
44 | # FIXME: restore backup | ||
45 | unless empty($front_version) { | 45 | unless empty($front_version) { |
46 | contain "role::cryptoportfolio::front" | 46 | contain "role::cryptoportfolio::front" |
47 | } | 47 | } |
diff --git a/modules/role/manifests/etherpad.pp b/modules/role/manifests/etherpad.pp index 5ab5023..119af56 100644 --- a/modules/role/manifests/etherpad.pp +++ b/modules/role/manifests/etherpad.pp | |||
@@ -22,6 +22,7 @@ class role::etherpad ( | |||
22 | include "profile::tools" | 22 | include "profile::tools" |
23 | include "profile::postgresql" | 23 | include "profile::postgresql" |
24 | include "profile::apache" | 24 | include "profile::apache" |
25 | include "profile::monitoring" | ||
25 | 26 | ||
26 | ensure_packages(["npm"]) | 27 | ensure_packages(["npm"]) |
27 | ensure_packages(["abiword"]) | 28 | ensure_packages(["abiword"]) |
@@ -121,4 +122,17 @@ class role::etherpad ( | |||
121 | proxy_preserve_host => true; | 122 | proxy_preserve_host => true; |
122 | default: * => $::profile::apache::apache_vhost_default; | 123 | default: * => $::profile::apache::apache_vhost_default; |
123 | } | 124 | } |
125 | |||
126 | @profile::monitoring::external_service { "Etherpad service is running on $web_host": | ||
127 | type => "web", | ||
128 | master => { | ||
129 | check_command => "check_https!$web_host!/!<title>Etherpad" | ||
130 | } | ||
131 | } | ||
132 | @profile::monitoring::external_service { "$web_host ssl certificate is up to date": | ||
133 | type => "web", | ||
134 | master => { | ||
135 | check_command => "check_https_certificate!$web_host" | ||
136 | } | ||
137 | } | ||
124 | } | 138 | } |