Merge f5373dd9cc6370d39bfed90790a6c15abf9fe512 into 3a01b2c84f2b0dc31fbd1f2bb962a2495ba27990

.version

@@ -1 +1 @@
-2.12.3
+2.12.2

README.md

@@ -1,7 +1,7 @@
 <p align="center">
 	<img src="https://nginxproxymanager.com/github.png">
 	<br><br>
-	<img src="https://img.shields.io/badge/version-2.12.3-green.svg?style=for-the-badge">
+	<img src="https://img.shields.io/badge/version-2.12.2-green.svg?style=for-the-badge">
 	<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
 		<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
 	</a>

backend/internal/access-list.js

@@ -508,13 +508,8 @@ const internalAccessList = {
 								if (typeof item.password !== 'undefined' && item.password.length) {
 									logger.info('Adding: ' + item.username);
 
-									utils.execFile('openssl', ['passwd', '-apr1', item.password])
+									utils.execFile('/usr/bin/htpasswd', ['-b', htpasswd_file, item.username, item.password])
-										.then((res) => {
+										.then((/*result*/) => {
-											try {
-												fs.appendFileSync(htpasswd_file, item.username + ':' + res + '\n', {encoding: 'utf8'});
-											} catch (err) {
-												reject(err);
-											}
 											next();
 										})
 										.catch((err) => {

backend/internal/certificate.js

@@ -313,9 +313,6 @@ const internalCertificate = {
 					.where('is_deleted', 0)
 					.andWhere('id', data.id)
 					.allowGraph('[owner]')
-					.allowGraph('[proxy_hosts]')
-					.allowGraph('[redirection_hosts]')
-					.allowGraph('[dead_hosts]')
 					.first();
 
 				if (access_data.permission_visibility !== 'all') {
@@ -467,9 +464,6 @@ const internalCertificate = {
 					.where('is_deleted', 0)
 					.groupBy('id')
 					.allowGraph('[owner]')
-					.allowGraph('[proxy_hosts]')
-					.allowGraph('[redirection_hosts]')
-					.allowGraph('[dead_hosts]')
 					.orderBy('nice_name', 'ASC');
 
 				if (access_data.permission_visibility !== 'all') {

backend/models/certificate.js

@@ -4,6 +4,7 @@
 const db      = require('../db');
 const helpers = require('../lib/helpers');
 const Model   = require('objection').Model;
+const User    = require('./user');
 const now     = require('./now_helper');
 
 Model.knex(db);
@@ -67,11 +68,6 @@ class Certificate extends Model {
 	}
 
 	static get relationMappings () {
-		const ProxyHost       = require('./proxy_host');
-		const DeadHost        = require('./dead_host');
-		const User            = require('./user');
-		const RedirectionHost = require('./redirection_host');
-
 		return {
 			owner: {
 				relation:   Model.HasOneRelation,
@@ -83,39 +79,6 @@ class Certificate extends Model {
 				modify: function (qb) {
 					qb.where('user.is_deleted', 0);
 				}
-			},
-			proxy_hosts: {
-				relation:   Model.HasManyRelation,
-				modelClass: ProxyHost,
-				join:       {
-					from: 'certificate.id',
-					to:   'proxy_host.certificate_id'
-				},
-				modify: function (qb) {
-					qb.where('proxy_host.is_deleted', 0);
-				}
-			},
-			dead_hosts: {
-				relation:   Model.HasManyRelation,
-				modelClass: DeadHost,
-				join:       {
-					from: 'certificate.id',
-					to:   'dead_host.certificate_id'
-				},
-				modify: function (qb) {
-					qb.where('dead_host.is_deleted', 0);
-				}
-			},
-			redirection_hosts: {
-				relation:   Model.HasManyRelation,
-				modelClass: RedirectionHost,
-				join:       {
-					from: 'certificate.id',
-					to:   'redirection_host.certificate_id'
-				},
-				modify: function (qb) {
-					qb.where('redirection_host.is_deleted', 0);
-				}
 			}
 		};
 	}

frontend/js/app/controller.js

@@ -4,438 +4,444 @@ const Tokens   = require('./tokens');
 
 module.exports = {
 
-	/**
+    /**
-	 * @param {String} route
+     * @param {String} route
-	 * @param {Object} [options]
+     * @param {Object} [options]
-	 * @returns {Boolean}
+     * @returns {Boolean}
-	 */
+     */
-	navigate: function (route, options) {
+    navigate: function (route, options) {
-		options = options || {};
+        options = options || {};
-		Backbone.history.navigate(route.toString(), options);
+        Backbone.history.navigate(route.toString(), options);
-		return true;
+        return true;
-	},
+    },
 
-	/**
+    /**
-	 * Login
+     * Login
-	 */
+     */
-	showLogin: function () {
+    showLogin: function () {
-		window.location = '/login';
+        window.location = '/login';
-	},
+    },
 
-	/**
+    /**
-	 * Users
+     * Users
-	 */
+     */
-	showUsers: function () {
+    showUsers: function () {
-		const controller = this;
+        let controller = this;
-		if (Cache.User.isAdmin()) {
+        if (Cache.User.isAdmin()) {
-			require(['./main', './users/main'], (App, View) => {
+            require(['./main', './users/main'], (App, View) => {
-				controller.navigate('/users');
+                controller.navigate('/users');
-				App.UI.showAppContent(new View());
+                App.UI.showAppContent(new View());
-			});
+            });
-		} else {
+        } else {
-			this.showDashboard();
+            this.showDashboard();
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * User Form
+     * User Form
-	 *
+     *
-	 * @param [model]
+     * @param [model]
-	 */
+     */
-	showUserForm: function (model) {
+    showUserForm: function (model) {
-		if (Cache.User.isAdmin()) {
+        if (Cache.User.isAdmin()) {
-			require(['./main', './user/form'], function (App, View) {
+            require(['./main', './user/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * User Permissions Form
+     * User Permissions Form
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showUserPermissions: function (model) {
+    showUserPermissions: function (model) {
-		if (Cache.User.isAdmin()) {
+        if (Cache.User.isAdmin()) {
-			require(['./main', './user/permissions'], function (App, View) {
+            require(['./main', './user/permissions'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * User Password Form
+     * User Password Form
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showUserPasswordForm: function (model) {
+    showUserPasswordForm: function (model) {
-		if (Cache.User.isAdmin() || model.get('id') === Cache.User.get('id')) {
+        if (Cache.User.isAdmin() || model.get('id') === Cache.User.get('id')) {
-			require(['./main', './user/password'], function (App, View) {
+            require(['./main', './user/password'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * User Delete Confirm
+     * User Delete Confirm
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showUserDeleteConfirm: function (model) {
+    showUserDeleteConfirm: function (model) {
-		if (Cache.User.isAdmin() && model.get('id') !== Cache.User.get('id')) {
+        if (Cache.User.isAdmin() && model.get('id') !== Cache.User.get('id')) {
-			require(['./main', './user/delete'], function (App, View) {
+            require(['./main', './user/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Dashboard
+     * Dashboard
-	 */
+     */
-	showDashboard: function () {
+    showDashboard: function () {
-		const controller = this;
+        let controller = this;
-		require(['./main', './dashboard/main'], (App, View) => {
-			controller.navigate('/');
-			App.UI.showAppContent(new View());
-		});
-	},
 
-	/**
+        require(['./main', './dashboard/main'], (App, View) => {
-	 * Nginx Proxy Hosts
+            controller.navigate('/');
-	 */
+            App.UI.showAppContent(new View());
-	showNginxProxy: function () {
+        });
-		if (Cache.User.isAdmin() || Cache.User.canView('proxy_hosts')) {
+    },
-			const controller = this;
 
-			require(['./main', './nginx/proxy/main'], (App, View) => {
+    /**
-				controller.navigate('/nginx/proxy');
+     * Nginx Proxy Hosts
-				App.UI.showAppContent(new View());
+     */
-			});
+    showNginxProxy: function () {
-		}
+        if (Cache.User.isAdmin() || Cache.User.canView('proxy_hosts')) {
-	},
+            let controller = this;
 
-	/**
+            require(['./main', './nginx/proxy/main'], (App, View) => {
-	 * Nginx Proxy Host Form
+                controller.navigate('/nginx/proxy');
-	 *
+                App.UI.showAppContent(new View());
-	 * @param [model]
+            });
-	 */
+        }
-	showNginxProxyForm: function (model) {
+    },
-		if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
-			require(['./main', './nginx/proxy/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Proxy Host Delete Confirm
+     * Nginx Proxy Host Form
-	 *
+     *
-	 * @param model
+     * @param [model]
-	 */
+     */
-	showNginxProxyDeleteConfirm: function (model) {
+    showNginxProxyForm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
-			require(['./main', './nginx/proxy/delete'], function (App, View) {
+            require(['./main', './nginx/proxy/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Nginx Redirection Hosts
+     * Proxy Host Delete Confirm
-	 */
+     *
-	showNginxRedirection: function () {
+     * @param model
-		if (Cache.User.isAdmin() || Cache.User.canView('redirection_hosts')) {
+     */
-			const controller = this;
+    showNginxProxyDeleteConfirm: function (model) {
-			require(['./main', './nginx/redirection/main'], (App, View) => {
+        if (Cache.User.isAdmin() || Cache.User.canManage('proxy_hosts')) {
-				controller.navigate('/nginx/redirection');
+            require(['./main', './nginx/proxy/delete'], function (App, View) {
-				App.UI.showAppContent(new View());
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Nginx Redirection Host Form
+     * Nginx Redirection Hosts
-	 *
+     */
-	 * @param [model]
+    showNginxRedirection: function () {
-	 */
+        if (Cache.User.isAdmin() || Cache.User.canView('redirection_hosts')) {
-	showNginxRedirectionForm: function (model) {
+            let controller = this;
-		if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
-			require(['./main', './nginx/redirection/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+            require(['./main', './nginx/redirection/main'], (App, View) => {
-	 * Proxy Redirection Delete Confirm
+                controller.navigate('/nginx/redirection');
-	 *
+                App.UI.showAppContent(new View());
-	 * @param model
+            });
-	 */
+        }
-	showNginxRedirectionDeleteConfirm: function (model) {
+    },
-		if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
-			require(['./main', './nginx/redirection/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Nginx Stream Hosts
+     * Nginx Redirection Host Form
-	 */
+     *
-	showNginxStream: function () {
+     * @param [model]
-		if (Cache.User.isAdmin() || Cache.User.canView('streams')) {
+     */
-			const controller = this;
+    showNginxRedirectionForm: function (model) {
-			require(['./main', './nginx/stream/main'], (App, View) => {
+        if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
-				controller.navigate('/nginx/stream');
+            require(['./main', './nginx/redirection/form'], function (App, View) {
-				App.UI.showAppContent(new View());
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Stream Form
+     * Proxy Redirection Delete Confirm
-	 *
+     *
-	 * @param [model]
+     * @param model
-	 */
+     */
-	showNginxStreamForm: function (model) {
+    showNginxRedirectionDeleteConfirm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('redirection_hosts')) {
-			require(['./main', './nginx/stream/form'], function (App, View) {
+            require(['./main', './nginx/redirection/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Stream Delete Confirm
+     * Nginx Stream Hosts
-	 *
+     */
-	 * @param model
+    showNginxStream: function () {
-	 */
+        if (Cache.User.isAdmin() || Cache.User.canView('streams')) {
-	showNginxStreamDeleteConfirm: function (model) {
+            let controller = this;
-		if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
-			require(['./main', './nginx/stream/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+            require(['./main', './nginx/stream/main'], (App, View) => {
-	 * Nginx Dead Hosts
+                controller.navigate('/nginx/stream');
-	 */
+                App.UI.showAppContent(new View());
-	showNginxDead: function () {
+            });
-		if (Cache.User.isAdmin() || Cache.User.canView('dead_hosts')) {
+        }
-			const controller = this;
+    },
-			require(['./main', './nginx/dead/main'], (App, View) => {
-				controller.navigate('/nginx/404');
-				App.UI.showAppContent(new View());
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Dead Host Form
+     * Stream Form
-	 *
+     *
-	 * @param [model]
+     * @param [model]
-	 */
+     */
-	showNginxDeadForm: function (model) {
+    showNginxStreamForm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
-			require(['./main', './nginx/dead/form'], function (App, View) {
+            require(['./main', './nginx/stream/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Dead Host Delete Confirm
+     * Stream Delete Confirm
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showNginxDeadDeleteConfirm: function (model) {
+    showNginxStreamDeleteConfirm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('streams')) {
-			require(['./main', './nginx/dead/delete'], function (App, View) {
+            require(['./main', './nginx/stream/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Help Dialog
+     * Nginx Dead Hosts
-	 *
+     */
-	 * @param {String}  title
+    showNginxDead: function () {
-	 * @param {String}  content
+        if (Cache.User.isAdmin() || Cache.User.canView('dead_hosts')) {
-	 */
+            let controller = this;
-	showHelp: function (title, content) {
-		require(['./main', './help/main'], function (App, View) {
-			App.UI.showModalDialog(new View({title: title, content: content}));
-		});
-	},
 
-	/**
+            require(['./main', './nginx/dead/main'], (App, View) => {
-	 * Nginx Access
+                controller.navigate('/nginx/404');
-	 */
+                App.UI.showAppContent(new View());
-	showNginxAccess: function () {
+            });
-		if (Cache.User.isAdmin() || Cache.User.canView('access_lists')) {
+        }
-			const controller = this;
+    },
-			require(['./main', './nginx/access/main'], (App, View) => {
-				controller.navigate('/nginx/access');
-				App.UI.showAppContent(new View());
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Nginx Access List Form
+     * Dead Host Form
-	 *
+     *
-	 * @param [model]
+     * @param [model]
-	 */
+     */
-	showNginxAccessListForm: function (model) {
+    showNginxDeadForm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
-			require(['./main', './nginx/access/form'], function (App, View) {
+            require(['./main', './nginx/dead/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Access List Delete Confirm
+     * Dead Host Delete Confirm
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showNginxAccessListDeleteConfirm: function (model) {
+    showNginxDeadDeleteConfirm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('dead_hosts')) {
-			require(['./main', './nginx/access/delete'], function (App, View) {
+            require(['./main', './nginx/dead/delete'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Nginx Certificates
+     * Help Dialog
-	 */
+     *
-	showNginxCertificates: function () {
+     * @param {String}  title
-		if (Cache.User.isAdmin() || Cache.User.canView('certificates')) {
+     * @param {String}  content
-			const controller = this;
+     */
-			require(['./main', './nginx/certificates/main'], (App, View) => {
+    showHelp: function (title, content) {
-				controller.navigate('/nginx/certificates');
+        require(['./main', './help/main'], function (App, View) {
-				App.UI.showAppContent(new View());
+            App.UI.showModalDialog(new View({title: title, content: content}));
-			});
+        });
-		}
+    },
-	},
 
-	/**
+    /**
-	 * Nginx Certificate Form
+     * Nginx Access
-	 *
+     */
-	 * @param [model]
+    showNginxAccess: function () {
-	 */
+        if (Cache.User.isAdmin() || Cache.User.canView('access_lists')) {
-	showNginxCertificateForm: function (model) {
+            let controller = this;
-		if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-			require(['./main', './nginx/certificates/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+            require(['./main', './nginx/access/main'], (App, View) => {
-	 * Certificate Renew
+                controller.navigate('/nginx/access');
-	 *
+                App.UI.showAppContent(new View());
-	 * @param model
+            });
-	 */
+        }
-	showNginxCertificateRenew: function (model) {
+    },
-		if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-			require(['./main', './nginx/certificates/renew'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Certificate Delete Confirm
+     * Nginx Access List Form
-	 *
+     *
-	 * @param model
+     * @param [model]
-	 */
+     */
-	showNginxCertificateDeleteConfirm: function (model) {
+    showNginxAccessListForm: function (model) {
-		if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
-			require(['./main', './nginx/certificates/delete'], function (App, View) {
+            require(['./main', './nginx/access/form'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		}
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Certificate Test Reachability
+     * Access List Delete Confirm
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showNginxCertificateTestReachability: function (model) {
+    showNginxAccessListDeleteConfirm: function (model) {
-	  if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('access_lists')) {
-		require(['./main', './nginx/certificates/test'], function (App, View) {
+            require(['./main', './nginx/access/delete'], function (App, View) {
-		  App.UI.showModalDialog(new View({model: model}));
+                App.UI.showModalDialog(new View({model: model}));
-		});
+            });
-	  }
+        }
-	},
+    },
 
-	/**
+    /**
-	 * Audit Log
+     * Nginx Certificates
-	 */
+     */
-	showAuditLog: function () {
+    showNginxCertificates: function () {
-		const controller = this;
+        if (Cache.User.isAdmin() || Cache.User.canView('certificates')) {
-		if (Cache.User.isAdmin()) {
+            let controller = this;
-			require(['./main', './audit-log/main'], (App, View) => {
-				controller.navigate('/audit-log');
-				App.UI.showAppContent(new View());
-			});
-		} else {
-			this.showDashboard();
-		}
-	},
 
-	/**
+            require(['./main', './nginx/certificates/main'], (App, View) => {
-	 * Audit Log Metadata
+                controller.navigate('/nginx/certificates');
-	 *
+                App.UI.showAppContent(new View());
-	 * @param model
+            });
-	 */
+        }
-	showAuditMeta: function (model) {
+    },
-		if (Cache.User.isAdmin()) {
-			require(['./main', './audit-log/meta'], function (App, View) {
-				App.UI.showModalDialog(new View({model: model}));
-			});
-		}
-	},
 
-	/**
+    /**
-	 * Settings
+     * Nginx Certificate Form
-	 */
+     *
-	showSettings: function () {
+     * @param [model]
-		const controller = this;
+     */
-		if (Cache.User.isAdmin()) {
+    showNginxCertificateForm: function (model) {
-			require(['./main', './settings/main'], (App, View) => {
+        if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-				controller.navigate('/settings');
+            require(['./main', './nginx/certificates/form'], function (App, View) {
-				App.UI.showAppContent(new View());
+                App.UI.showModalDialog(new View({model: model}));
-			});
+            });
-		} else {
+        }
-			this.showDashboard();
+    },
-		}
-	},
 
-	/**
+    /**
-	 * Settings Item Form
+     * Certificate Renew
-	 *
+     *
-	 * @param model
+     * @param model
-	 */
+     */
-	showSettingForm: function (model) {
+    showNginxCertificateRenew: function (model) {
-		if (Cache.User.isAdmin()) {
+        if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
-			if (model.get('id') === 'default-site') {
+            require(['./main', './nginx/certificates/renew'], function (App, View) {
-				require(['./main', './settings/default-site/main'], function (App, View) {
+                App.UI.showModalDialog(new View({model: model}));
-					App.UI.showModalDialog(new View({model: model}));
+            });
-				});
+        }
-			}
+    },
-		}
-	},
 
-	/**
+    /**
-	 * Logout
+     * Certificate Delete Confirm
-	 */
+     *
-	logout: function () {
+     * @param model
-		Tokens.dropTopToken();
+     */
-		this.showLogin();
+    showNginxCertificateDeleteConfirm: function (model) {
-	}
+        if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+            require(['./main', './nginx/certificates/delete'], function (App, View) {
+                App.UI.showModalDialog(new View({model: model}));
+            });
+        }
+    },
+
+    /**
+     * Certificate Test Reachability
+     *
+     * @param model
+     */
+    showNginxCertificateTestReachability: function (model) {
+      if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) {
+        require(['./main', './nginx/certificates/test'], function (App, View) {
+          App.UI.showModalDialog(new View({model: model}));
+        });
+      }
+    },
+
+    /**
+     * Audit Log
+     */
+    showAuditLog: function () {
+        let controller = this;
+        if (Cache.User.isAdmin()) {
+            require(['./main', './audit-log/main'], (App, View) => {
+                controller.navigate('/audit-log');
+                App.UI.showAppContent(new View());
+            });
+        } else {
+            this.showDashboard();
+        }
+    },
+
+    /**
+     * Audit Log Metadata
+     *
+     * @param model
+     */
+    showAuditMeta: function (model) {
+        if (Cache.User.isAdmin()) {
+            require(['./main', './audit-log/meta'], function (App, View) {
+                App.UI.showModalDialog(new View({model: model}));
+            });
+        }
+    },
+
+    /**
+     * Settings
+     */
+    showSettings: function () {
+        let controller = this;
+        if (Cache.User.isAdmin()) {
+            require(['./main', './settings/main'], (App, View) => {
+                controller.navigate('/settings');
+                App.UI.showAppContent(new View());
+            });
+        } else {
+            this.showDashboard();
+        }
+    },
+
+    /**
+     * Settings Item Form
+     *
+     * @param model
+     */
+    showSettingForm: function (model) {
+        if (Cache.User.isAdmin()) {
+            if (model.get('id') === 'default-site') {
+                require(['./main', './settings/default-site/main'], function (App, View) {
+                    App.UI.showModalDialog(new View({model: model}));
+                });
+            }
+        }
+    },
+
+    /**
+     * Logout
+     */
+    logout: function () {
+        Tokens.dropTopToken();
+        this.showLogin();
+    }
 };

frontend/js/app/dashboard/main.js

@@ -6,85 +6,87 @@ const Helpers    = require('../../lib/helpers');
 const template   = require('./main.ejs');
 
 module.exports = Mn.View.extend({
-	template: template,
+    template: template,
-	id:       'dashboard',
+    id:       'dashboard',
-	columns:  0,
+    columns:  0,
 
-	stats: {},
+    stats: {},
 
-	ui: {
+    ui: {
-		links: 'a'
+        links: 'a'
-	},
+    },
 
-	events: {
+    events: {
-		'click @ui.links': function (e) {
+        'click @ui.links': function (e) {
-			e.preventDefault();
+            e.preventDefault();
-			Controller.navigate($(e.currentTarget).attr('href'), true);
+            Controller.navigate($(e.currentTarget).attr('href'), true);
-		}
+        }
-	},
+    },
 
-	templateContext: function () {
+    templateContext: function () {
-		const view = this;
+        let view = this;
 
-		return {
+        return {
-			getUserName: function () {
+            getUserName: function () {
-				return Cache.User.get('nickname') || Cache.User.get('name');
+                return Cache.User.get('nickname') || Cache.User.get('name');
-			},
+            },
 
-			getHostStat: function (type) {
+            getHostStat: function (type) {
-				if (view.stats && typeof view.stats.hosts !== 'undefined' && typeof view.stats.hosts[type] !== 'undefined') {
+                if (view.stats && typeof view.stats.hosts !== 'undefined' && typeof view.stats.hosts[type] !== 'undefined') {
-					return Helpers.niceNumber(view.stats.hosts[type]);
+                    return Helpers.niceNumber(view.stats.hosts[type]);
-				}
+                }
 
-				return '-';
+                return '-';
-			},
+            },
 
-			canShow: function (perm) {
+            canShow: function (perm) {
-				return Cache.User.isAdmin() || Cache.User.canView(perm);
+                return Cache.User.isAdmin() || Cache.User.canView(perm);
-			},
+            },
 
-			columns: view.columns
+            columns: view.columns
-		};
+        };
-	},
+    },
 
-	onRender: function () {
+    onRender: function () {
-		const view = this;
+        let view = this;
-		if (typeof view.stats.hosts === 'undefined') {
-			Api.Reports.getHostStats()
-				.then(response => {
-					if (!view.isDestroyed()) {
-						view.stats.hosts = response;
-						view.render();
-					}
-				})
-				.catch(err => {
-					console.log(err);
-				});
-		}
-	},
 
-	/**
+        if (typeof view.stats.hosts === 'undefined') {
-	 * @param {Object}  [model]
+            Api.Reports.getHostStats()
-	 */
+                .then(response => {
-	preRender: function (model) {
+                    if (!view.isDestroyed()) {
-		this.columns = 0;
+                        view.stats.hosts = response;
+                        view.render();
+                    }
+                })
+                .catch(err => {
+                    console.log(err);
+                });
+        }
+    },
 
-		// calculate the available columns based on permissions for the objects
+    /**
-		// and store as a variable
+     * @param {Object}  [model]
-		const perms = ['proxy_hosts', 'redirection_hosts', 'streams', 'dead_hosts'];
+     */
+    preRender: function (model) {
+        this.columns = 0;
 
-		perms.map(perm => {
+        // calculate the available columns based on permissions for the objects
-			this.columns += Cache.User.isAdmin() || Cache.User.canView(perm) ? 1 : 0;
+        // and store as a variable
-		});
+        //let view = this;
+        let perms = ['proxy_hosts', 'redirection_hosts', 'streams', 'dead_hosts'];
 
-		// Prevent double rendering on initial calls
+        perms.map(perm => {
-		if (typeof model !== 'undefined') {
+            this.columns += Cache.User.isAdmin() || Cache.User.canView(perm) ? 1 : 0;
-			this.render();
+        });
-		}
-	},
 
-	initialize: function () {
+        // Prevent double rendering on initial calls
-		this.preRender();
+        if (typeof model !== 'undefined') {
-		this.listenTo(Cache.User, 'change', this.preRender);
+            this.render();
-	}
+        }
+    },
+
+    initialize: function () {
+        this.preRender();
+        this.listenTo(Cache.User, 'change', this.preRender);
+    }
 });

frontend/js/app/nginx/certificates/list/item.ejs

@@ -33,13 +33,6 @@
 <td class="<%- isExpired() ? 'text-danger' : '' %>">
     <%- formatDbDate(expires_on, 'Do MMMM YYYY, h:mm a') %>
 </td>
-<td>
-    <% if (active_domain_names().length > 0) { %>
-        <span class="status-icon bg-success"></span> <%- i18n('certificates', 'in-use') %>
-    <% } else { %>
-        <span class="status-icon bg-danger"></span> <%- i18n('certificates', 'inactive') %>
-    <% } %>
-</td>
 <% if (canManage) { %>
 <td class="text-right">
     <div class="item-action dropdown">
@@ -55,14 +48,7 @@
                 <div class="dropdown-divider"></div>
             <% } %>
             <a href="#" class="delete dropdown-item"><i class="dropdown-icon fe fe-trash-2"></i> <%- i18n('str', 'delete') %></a>
-            <% if (active_domain_names().length > 0) { %>
-                <div class="dropdown-divider"></div>
-                <span class="dropdown-header"><%- i18n('certificates', 'active-domain_names') %></span>
-                <% active_domain_names().forEach(function(host) { %>
-                    <a href="https://<%- host %>" class="dropdown-item" target="_blank"><%- host %></a>
-                <% }); %>
-            <% } %>
         </div>
     </div>
 </td>
-<% } %>
+<% } %>

frontend/js/app/nginx/certificates/list/item.js

@@ -44,24 +44,14 @@ module.exports = Mn.View.extend({
         },
     },
 
-    templateContext: function () {
+    templateContext: {
-        return {
+        canManage: App.Cache.User.canManage('certificates'),
-            canManage: App.Cache.User.canManage('certificates'),
+        isExpired: function () {
-            isExpired: function () {
+            return moment(this.expires_on).isBefore(moment());
-                return moment(this.expires_on).isBefore(moment());
+        },
-            },
+        dns_providers: dns_providers
-            dns_providers: dns_providers,
-            active_domain_names: function () {
-                const { proxy_hosts = [], redirect_hosts = [], dead_hosts = [] } = this;
-                return [...proxy_hosts, ...redirect_hosts, ...dead_hosts].reduce((acc, host) => {
-                    acc.push(...(host.domain_names || []));
-                    return acc;
-                }, []);
-            }
-        };
     },
 
-
     initialize: function () {
         this.listenTo(this.model, 'change', this.render);
     }

frontend/js/app/nginx/certificates/list/main.ejs

@@ -3,7 +3,6 @@
     <th><%- i18n('str', 'name') %></th>
     <th><%- i18n('all-hosts', 'cert-provider') %></th>
     <th><%- i18n('str', 'expires') %></th>
-    <th><%- i18n('str', 'status') %></th>
     <% if (canManage) { %>
     <th>&nbsp;</th>
     <% } %>

frontend/js/app/nginx/certificates/main.js

@@ -74,7 +74,7 @@ module.exports = Mn.View.extend({
             e.preventDefault();
             let query = this.ui.query.val();
 
-            this.fetch(['owner','proxy_hosts', 'dead_hosts', 'redirection_hosts'], query)
+            this.fetch(['owner'], query)
                 .then(response => this.showData(response))
                 .catch(err => {
                     this.showError(err);
@@ -89,7 +89,7 @@ module.exports = Mn.View.extend({
     onRender: function () {
         let view = this;
 
-        view.fetch(['owner','proxy_hosts', 'dead_hosts', 'redirection_hosts'])
+        view.fetch(['owner'])
             .then(response => {
                 if (!view.isDestroyed()) {
                     if (response && response.length) {

frontend/js/i18n/messages.json

@@ -208,10 +208,7 @@
       "reachability-other": "There is a server found at this domain but it returned an unexpected status code {code}. Is it the NPM server? Please make sure your domain points to the IP where your NPM instance is running.",
       "download": "Download",
       "renew-title": "Renew Let's Encrypt Certificate",
-      "search": "Search Certificate…",
+      "search": "Search Certificate…"
-      "in-use"  : "In use",
-      "inactive": "Inactive",
-      "active-domain_names": "Active domain names"
     },
     "access-lists": {
       "title": "Access Lists",

global/certbot-dns-plugins.json

@@ -161,11 +161,11 @@
 	},
 	"domainoffensive": {
 		"name": "DomainOffensive (do.de)",
-		"package_name": "certbot-dns-domainoffensive",
+		"package_name": "certbot-dns-do",
-		"version": "~=2.0.0",
+		"version": "~=0.31.0",
 		"dependencies": "",
 		"credentials": "dns_do_api_token = YOUR_DO_DE_AUTH_TOKEN",
-		"full_plugin_name": "dns-domainoffensive"
+		"full_plugin_name": "dns-do"
 	},
 	"domeneshop": {
 		"name": "Domeneshop",
@@ -534,13 +534,5 @@
 		"dependencies": "",
 		"credentials": "edgedns_client_secret = as3d1asd5d1a32sdfsdfs2d1asd5=\nedgedns_host = sdflskjdf-dfsdfsdf-sdfsdfsdf.luna.akamaiapis.net\nedgedns_access_token = kjdsi3-34rfsdfsdf-234234fsdfsdf\nedgedns_client_token = dkfjdf-342fsdfsd-23fsdfsdfsdf",
 		"full_plugin_name": "edgedns"
-	},
+	}
-	"zoneedit": {
-		"name": "ZoneEdit",
-		"package_name": "certbot-dns-zoneedit",
-		"version": "~=0.3.2",
-		"dependencies": "--no-deps dnspython",
-		"credentials": "dns_zoneedit_user = <login-user-id>\ndns_zoneedit_token = <dyn-authentication-token>",
-		"full_plugin_name": "dns-zoneedit"
- 	}
 }