diff --git a/Makefile b/Makefile index 9a87e9c2a..a370048a5 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,7 @@ CORE_DEPENDS?= ${CORE_DEPENDS_${CORE_ARCH}} \ isc-dhcp43-relay \ isc-dhcp43-server \ lighttpd \ + monit \ mpd5 \ ntp \ openssh-portable \ diff --git a/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt b/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt index e4fd2fada..4d6fa4f02 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt @@ -57,9 +57,7 @@ POSSIBILITY OF SUCH DAMAGE. ajaxCall(url="/api/monit/service/reconfigure", sendData={}, callback=function(data,status) { $('#btn_reload_progress').removeClass("fa fa-spinner fa-pulse"); $('#btn_reload').blur(); - ajaxCall(url="/api/monit/service/status", sendData={}, callback=function(data,status) { - updateServiceStatusUI(data['status']); - }); + updateServiceControlUI('monit'); }); }); @@ -72,9 +70,7 @@ POSSIBILITY OF SUCH DAMAGE. mapDataToFormUI({'frm_GeneralSettings':"/api/monit/settings/get/general/"}).done(function(){ formatTokenizersUI(); $('.selectpicker').selectpicker('refresh'); - ajaxCall(url="/api/monit/service/status", sendData={}, callback=function(data,status) { - updateServiceStatusUI(data['status']); - }); + updateServiceControlUI('monit'); }); }); }); @@ -86,9 +82,7 @@ POSSIBILITY OF SUCH DAMAGE. mapDataToFormUI({'frm_GeneralSettings':"/api/monit/settings/get/general/"}).done(function(){ formatTokenizersUI(); $('.selectpicker').selectpicker('refresh'); - ajaxCall(url="/api/monit/service/status", sendData={}, callback=function(data,status) { - updateServiceStatusUI(data['status']); - }); + updateServiceControlUI('monit'); }); // show/hide httpd/mmonit options @@ -118,9 +112,7 @@ POSSIBILITY OF SUCH DAMAGE. $("#frm_GeneralSettings_progress").addClass("fa fa-spinner fa-pulse"); var frm_id = 'frm_GeneralSettings'; saveFormToEndpoint(url = "/api/monit/settings/set/general/",formid=frm_id,callback_ok=function(){ - ajaxCall(url="/api/monit/service/status", sendData={}, callback=function(data,status) { - updateServiceStatusUI(data['status']); - }); + updateServiceControlUI('monit'); }); $("#"+frm_id+"_progress").removeClass("fa fa-spinner fa-pulse"); $("#btn_ApplyGeneralSettings").blur();