Merge ~moon127/mojo/+git/mojo-specs:ps5 into ~mojo-maintainers/mojo/+git/mojo-specs:master

Proposed by Gareth Woolridge
Status: Merged
Approved by: Gareth Woolridge
Approved revision: 3ad032db4695ffed970afec9b7459f067e3e0a32
Merged at revision: 3ad032db4695ffed970afec9b7459f067e3e0a32
Proposed branch: ~moon127/mojo/+git/mojo-specs:ps5
Merge into: ~mojo-maintainers/mojo/+git/mojo-specs:master
Diff against target: 24 lines (+2/-0)
2 files modified
mojo-how-to/devel/bundle-services (+1/-0)
mojo-how-to/production/bundle-services (+1/-0)
Reviewer Review Type Date Requested Status
Benjamin Allot Approve
Review via email: mp+401869@code.launchpad.net

Commit message

mojo-how-to: Don't disable status module, needed for telegraph apache monitoring via relation

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Benjamin Allot (ballot) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/mojo-how-to/devel/bundle-services b/mojo-how-to/devel/bundle-services
index 45e45ae..e94b84d 100644
--- a/mojo-how-to/devel/bundle-services
+++ b/mojo-how-to/devel/bundle-services
@@ -7,6 +7,7 @@ applications:
7 options:7 options:
8 servername: mojo-how-to.example.com8 servername: mojo-how-to.example.com
9 enable_modules: "ssl"9 enable_modules: "ssl"
10 disable_modules: "autoindex"
10 nagios_check_http_params: "-I 127.0.0.1 -H mojo-how-to-example.com -e '200' -s 'Mojo'"11 nagios_check_http_params: "-I 127.0.0.1 -H mojo-how-to-example.com -e '200' -s 'Mojo'"
11 vhost_http_template: 'include-base64://{{spec_dir}}/{{stage}}/../configs/mojo-how-to-vhost-http.template'12 vhost_http_template: 'include-base64://{{spec_dir}}/{{stage}}/../configs/mojo-how-to-vhost-http.template'
12 ssl_cert: SELFSIGNED13 ssl_cert: SELFSIGNED
diff --git a/mojo-how-to/production/bundle-services b/mojo-how-to/production/bundle-services
index e6d1d53..51d7e0d 100644
--- a/mojo-how-to/production/bundle-services
+++ b/mojo-how-to/production/bundle-services
@@ -8,6 +8,7 @@ applications:
8 options:8 options:
9 servername: mojo.canonical.com9 servername: mojo.canonical.com
10 enable_modules: "ssl"10 enable_modules: "ssl"
11 disable_modules: "autoindex"
11 nagios_check_http_params: -I 127.0.0.1 -H mojo.canonical.com -S -e '200' -s 'Mojo'12 nagios_check_http_params: -I 127.0.0.1 -H mojo.canonical.com -S -e '200' -s 'Mojo'
12 nagios_context: prod-mojo-how-to13 nagios_context: prod-mojo-how-to
13 autocert-apache2:14 autocert-apache2:

Subscribers

People subscribed via source and target branches