Merge lp:~evarlast/charms/trusty/juju-gui/nrpe-check-update into lp:charms/trusty/juju-gui

[Jay R. Wren]

When the legacy server was removed the nrpe check was never updated to match.

Ideally this check out use the configured port, but in practice the demo deployment is only thing which uses this and it runs on port 80.

[Madison Scott-Clary (makyo)]

LGTM, much simpler.

review: Approve (code)

[Martin Hilton (martin-hilton)]

LGTM

review: Approve

=== modified file 'files/nrpe-external-master/check-app-access.sh'
--- files/nrpe-external-master/check-app-access.sh	2014-02-18 12:18:02 +0000
+++ files/nrpe-external-master/check-app-access.sh	2015-09-17 21:02:32 +0000
@@ -1,14 +1,8 @@
 #!/bin/bash
-SITE_CONF='/etc/apache2/sites-enabled/juju-gui'
-ADDRESS='https://127.0.0.1:443/juju-ui/version.js'
+ADDRESS='http://127.0.0.1/juju-ui/version.js'
 LIFE_SIGN='jujuGuiVersionInfo'
 
-if [[ ! -f $SITE_CONF ]]; then
-    echo Apache is not configured serve juju-gui.
-    exit 2
-fi
-
-match=$(curl -s -k $ADDRESS | grep "$LIFE_SIGN")
+match=$(curl -s $ADDRESS | grep "$LIFE_SIGN")
 
 if [[ -z $match ]]; then
     echo juju-gui did not return content indicating it was loading.