~npochet/charm-nagios:fix-ssl

Branch merges

Propose for merging

Merged into ~nagios-charmers/charm-nagios:master at revision cec6830a4a9dcbde6611c634fbd7f43fb69a2fdf

Tom Haddon: Approve on 2019-04-29

Stuart Bishop (community): Approve on 2019-04-29

Diff: 67 lines (+9/-7)

2 files modified

hooks/templates/default-ssl.tmpl (+2/-2)
hooks/upgrade-charm (+7/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

cdbbeb8... by Nicolas Pochet on 2019-04-29

Fix typo for SSL

* Write ssl file to /etc/apache2/sites-available/default-ssl.conf
instead of /etc/apache2/sites-available/default-ssl
* Modify template to point to /var/www/html
* Fixes LP:1777904

cdc4f22... by Alvaro Uria on 2019-04-29

Nagios checks the rootfs on containers

Reviewed-on: https://code.launchpad.net/~aluria/nagios-charm/+git/nagios-charm/+merge/363865
Reviewed-by: Andrea Ieri <email address hidden>

5170869... by Andrea Ieri on 2019-04-23

Make pagerduty_nagios.pl enqueue proxy aware

Reviewed-on: https://code.launchpad.net/~aieri/nagios-charm/+git/nagios-charm/+merge/366303
Reviewed-by: Alvaro Uria <email address hidden>

7216eb1... by Andrea Ieri on 2019-04-19

Make pagerduty_nagios.pl enqueue proxy aware

The cronjob for pagerduty_nagios.pl flush had already been updated to
use the --proxy switch if needed. This commit adds the same switch to
the enqueue action.

Fixes: 1825489

c84ee52... by Alvaro Uria on 2019-03-01

Nagios checks the rootfs on containers

 * If the nagios unit runs in a container, check_disk -p / will be used
 * If the nagios unit runs on baremetal, check_all_disks (-e) will be
 used (same behavior as before this change)

Closes-Bug: 1748430

c14ecce... by Andrea Ieri on 2018-12-11

When configuring the pagerduty cronjob, prefer juju-*-proxy variables if they are available.

Reviewed-on: https://code.launchpad.net/~aieri/nagios-charm/+git/nagios-charm/+merge/360658
Reviewed-by: Chris Sanders <email address hidden>

0fd85e2... by Andrea Ieri on 2018-12-11

When configuring the pagerduty cronjob, prefer juju-*-proxy variables if
they are available.

668d0e4... by Drew Freiberger on 2018-08-20

Added check_timeout to configure external monitor socket timeouts

Reviewed-on: https://code.launchpad.net/~afreiberger/nagios-charm/+git/nagios-charm/+merge/353461
Reviewed-by: Jay Kuri <email address hidden>

0f2fe8a... by Drew Freiberger on 2018-08-20

Added check_timeout to configure external monitor socket timeouts

b128abd... by Xav Paice on 2018-08-02

new config option to change pagerduty alert levels

Reviewed-on: https://code.launchpad.net/~xavpaice/nagios-charm/+git/nagios-charm/+merge/352052
Reviewed-by: Barry Price <email address hidden>