Remove spammy ssl renewal process and replace with the system checker and run it every 6 hours

This commit is contained in:
Jamie Curnow
2018-03-15 15:29:36 +10:00
parent f10d8e4aa9
commit f60ffd85da
10 changed files with 13 additions and 171 deletions

View File

@ -118,14 +118,6 @@ module.exports = {
*/
reconfigure: function (_id) {
return fetch('post', 'hosts/' + _id + '/reconfigure');
},
/**
* @param {String} _id
* @returns {Promise}
*/
renew: function (_id) {
return fetch('post', 'hosts/' + _id + '/renew');
}
},

View File

@ -119,17 +119,6 @@ module.exports = {
});
},
/**
* Show Renew Host
*
* @param model
*/
showRenewHost: function (model) {
require(['./main', './host/renew'], function (App, View) {
App.UI.showModalDialog(new View({model: model}));
});
},
/**
* Show Advanced Host
*

View File

@ -42,9 +42,6 @@
<% } %>
</td>
<td class="text-right">
<% if (ssl) { %>
<button type="button" class="btn btn-default btn-xs renew" title="Renew SSL"><i class="fa fa-shield" aria-hidden="true"></i></button>
<% } %>
<button type="button" class="btn btn-default btn-xs reconfigure" title="Reconfigure Nginx"><i class="fa fa-refresh" aria-hidden="true"></i></button>
<button type="button" class="btn btn-default btn-xs advanced" title="Advanced Configuration"<%- type === 'stream' ? ' disabled' : '' %>><i class="fa fa-code" aria-hidden="true"></i></button>
<button type="button" class="btn btn-warning btn-xs edit" title="Edit"><i class="fa fa-pencil" aria-hidden="true"></i></button>

View File

@ -15,7 +15,6 @@ module.exports = Mn.View.extend({
delete: 'button.delete',
access_list: 'a.access_list',
reconfigure: 'button.reconfigure',
renew: 'button.renew',
advanced: 'button.advanced'
},
@ -53,11 +52,6 @@ module.exports = Mn.View.extend({
Controller.showReconfigureHost(this.model);
},
'click @ui.renew': function (e) {
e.preventDefault();
Controller.showRenewHost(this.model);
},
'click @ui.advanced': function (e) {
e.preventDefault();
Controller.showAdvancedHost(this.model);

View File

@ -1,17 +0,0 @@
<div class="modal-dialog">
<div class="modal-content">
<form class="form-horizontal">
<div class="modal-header text-left">
<h4 class="modal-title">Renew SSL Certificates</h4>
</div>
<div class="modal-body">
<p>This will renew the SSL Certificates for the host. This normally happens automatically however if you notice
SSL working incorrectly, this may fix it.</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-success renew">Renew SSL</button>
</div>
</form>
</div>
</div>

View File

@ -1,33 +0,0 @@
'use strict';
import Mn from 'backbone.marionette';
const template = require('./renew.ejs');
const Api = require('../api');
const App = require('../main');
module.exports = Mn.View.extend({
template: template,
ui: {
buttons: 'form button',
renew: 'button.renew'
},
events: {
'click @ui.renew': function (e) {
e.preventDefault();
this.ui.buttons.prop('disabled', true).addClass('btn-disabled');
Api.Hosts.renew(this.model.get('_id'))
.then((/*result*/) => {
App.UI.closeModal();
})
.catch(err => {
alert(err.message);
this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
});
}
}
});