Sets certbot official dns plugin version requirement to match certbot version

Merge pull request #1666 from TobiasKneidl/patch-1
Update default.conf to follow the default site setting also for ipv6
2021-12-29 09:54:59 +01:00 · 2021-12-27 11:03:14 +10:00 · 2021-12-27 11:02:16 +10:00 · 2021-12-23 12:23:30 +01:00 · 2021-12-22 11:52:27 +10:00 · 2021-12-22 11:51:32 +10:00
67 changed files with 785 additions and 2714 deletions
--- a/.version
+++ b/.version
@ -1 +1 @@
-2.9.9
+2.9.13
--- a/2
+++ b/2
@ -68,7 +68,7 @@ pipeline {
 					-v "$(pwd)/global:/app/global" \\
 					-w /app \\
 					node:latest \\
-					sh -c "yarn install && yarn eslint . && rm -rf node_modules"
+					sh -c "ln -s /usr/bin/python3 /usr/bin/python && yarn install && yarn eslint . && rm -rf node_modules"
 				'''

 				echo 'Docker Build ...'
--- a/README.md
+++ b/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.9.9-green.svg?style=for-the-badge">
+	<img src="https://img.shields.io/badge/version-2.9.13-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>
@ -74,28 +74,12 @@ services:
      - '80:80'
      - '81:81'
      - '443:443'
-    environment:
-      DB_MYSQL_HOST: "db"
-      DB_MYSQL_PORT: 3306
-      DB_MYSQL_USER: "npm"
-      DB_MYSQL_PASSWORD: "npm"
-      DB_MYSQL_NAME: "npm"
    volumes:
      - ./data:/data
      - ./letsencrypt:/etc/letsencrypt
-  db:
-    image: 'jc21/mariadb-aria:latest'
-    restart: unless-stopped
-    environment:
-      MYSQL_ROOT_PASSWORD: 'npm'
-      MYSQL_DATABASE: 'npm'
-      MYSQL_USER: 'npm'
-      MYSQL_PASSWORD: 'npm'
-    volumes:
-      - ./data/mysql:/var/lib/mysql
 ```

-3. Bring up your stack
+3. Bring up your stack by running

 ```bash
 docker-compose up -d
--- a/backend/app.js
+++ b/backend/app.js
@ -40,13 +40,12 @@ app.use(function (req, res, next) {
 	}

 	res.set({
-		'Strict-Transport-Security': 'includeSubDomains; max-age=631138519; preload',
-		'X-XSS-Protection':          '1; mode=block',
-		'X-Content-Type-Options':    'nosniff',
-		'X-Frame-Options':           x_frame_options,
-		'Cache-Control':             'no-cache, no-store, max-age=0, must-revalidate',
-		Pragma:                      'no-cache',
-		Expires:                     0
+		'X-XSS-Protection':       '1; mode=block',
+		'X-Content-Type-Options': 'nosniff',
+		'X-Frame-Options':        x_frame_options,
+		'Cache-Control':          'no-cache, no-store, max-age=0, must-revalidate',
+		Pragma:                   'no-cache',
+		Expires:                  0
 	});
 	next();
 });
@ -74,10 +73,12 @@ app.use(function (err, req, res, next) {
 	}

 	// Not every error is worth logging - but this is good for now until it gets annoying.
-	if (process.env.NODE_ENV === 'development' || process.env.DEBUG) {
-		log.debug(err);
-	} else if (typeof err.stack !== 'undefined' && err.stack && (typeof err.public == 'undefined' || !err.public)) {
-		log.warn(err.message);
+	if (typeof err.stack !== 'undefined' && err.stack) {
+		if (process.env.NODE_ENV === 'development' || process.env.DEBUG) {
+			log.debug(err.stack);
+		} else if (typeof err.public == 'undefined' || !err.public) {
+			log.warn(err.message);
+		}
 	}

 	res
--- a/backend/index.js
+++ b/backend/index.js
@ -44,84 +44,85 @@ async function appStart () {

 async function createDbConfigFromEnvironment() {
 	return new Promise((resolve, reject) => {
-		const envMysqlHost  = process.env.DB_MYSQL_HOST || null;
-		const envMysqlPort  = process.env.DB_MYSQL_PORT || null;
-		const envMysqlUser  = process.env.DB_MYSQL_USER || null;
-		const envMysqlName  = process.env.DB_MYSQL_NAME || null;
-		const envSqliteFile = process.env.DB_SQLITE_FILE || null;
+		const envMysqlHost = process.env.DB_MYSQL_HOST || null;
+		const envMysqlPort = process.env.DB_MYSQL_PORT || null;
+		const envMysqlUser = process.env.DB_MYSQL_USER || null;
+		const envMysqlName = process.env.DB_MYSQL_NAME || null;
+		let envSqliteFile  = process.env.DB_SQLITE_FILE || null;

-		if ((envMysqlHost && envMysqlPort && envMysqlUser && envMysqlName) || envSqliteFile) {
-			const fs       = require('fs');
-			const filename = (process.env.NODE_CONFIG_DIR || './config') + '/' + (process.env.NODE_ENV || 'default') + '.json';
-			let configData = {};
+		const fs       = require('fs');
+		const filename = (process.env.NODE_CONFIG_DIR || './config') + '/' + (process.env.NODE_ENV || 'default') + '.json';
+		let configData = {};

-			try {
-				configData = require(filename);
-			} catch (err) {
-				// do nothing
-			}
+		try {
+			configData = require(filename);
+		} catch (err) {
+			// do nothing
+		}

-			if (configData.database && configData.database.engine && !configData.database.fromEnv) {
-				logger.info('Manual db configuration already exists, skipping config creation from environment variables');
+		if (configData.database && configData.database.engine && !configData.database.fromEnv) {
+			logger.info('Manual db configuration already exists, skipping config creation from environment variables');
+			resolve();
+			return;
+		}
+
+		if ((!envMysqlHost || !envMysqlPort || !envMysqlUser || !envMysqlName) && !envSqliteFile){
+			envSqliteFile = '/data/database.sqlite';
+			logger.info(`No valid environment variables for database provided, using default SQLite file '${envSqliteFile}'`);
+		}
+
+		if (envMysqlHost && envMysqlPort && envMysqlUser && envMysqlName) {
+			const newConfig = {
+				fromEnv:  true,
+				engine:   'mysql',
+				host:     envMysqlHost,
+				port:     envMysqlPort,
+				user:     envMysqlUser,
+				password: process.env.DB_MYSQL_PASSWORD,
+				name:     envMysqlName,
+			};
+
+			if (JSON.stringify(configData.database) === JSON.stringify(newConfig)) {
+				// Config is unchanged, skip overwrite
 				resolve();
 				return;
 			}

-			if (envMysqlHost && envMysqlPort && envMysqlUser && envMysqlName) {
-				const newConfig = {
-					fromEnv:  true,
-					engine:   'mysql',
-					host:     envMysqlHost,
-					port:     envMysqlPort,
-					user:     envMysqlUser,
-					password: process.env.DB_MYSQL_PASSWORD,
-					name:     envMysqlName,
-				};
+			logger.info('Generating MySQL knex configuration from environment variables');
+			configData.database = newConfig;

-				if (JSON.stringify(configData.database) === JSON.stringify(newConfig)) {
-					// Config is unchanged, skip overwrite
-					resolve();
-					return;
+		} else {
+			const newConfig = {
+				fromEnv: true,
+				engine:  'knex-native',
+				knex:    {
+					client:     'sqlite3',
+					connection: {
+						filename: envSqliteFile
+					},
+					useNullAsDefault: true
 				}
-
-				logger.info('Generating MySQL db configuration from environment variables');
-				configData.database = newConfig;
-
-			} else {
-				const newConfig = {
-					fromEnv: true,
-					engine:  'knex-native',
-					knex:    {
-						client:     'sqlite3',
-						connection: {
-							filename: envSqliteFile
-						},
-						useNullAsDefault: true
-					}
-				};
-				if (JSON.stringify(configData.database) === JSON.stringify(newConfig)) {
-					// Config is unchanged, skip overwrite
-					resolve();
-					return;
-				}
-
-				logger.info('Generating Sqlite db configuration from environment variables');
-				configData.database = newConfig;
+			};
+			if (JSON.stringify(configData.database) === JSON.stringify(newConfig)) {
+				// Config is unchanged, skip overwrite
+				resolve();
+				return;
 			}

-			// Write config
-			fs.writeFile(filename, JSON.stringify(configData, null, 2), (err) => {
-				if (err) {
-					logger.error('Could not write db config to config file: ' + filename);
-					reject(err);
-				} else {
-					logger.info('Wrote db configuration to config file: ' + filename);
-					resolve();
-				}
-			});
-		} else {
-			resolve();
+			logger.info('Generating SQLite knex configuration');
+			configData.database = newConfig;
 		}
+
+		// Write config
+		fs.writeFile(filename, JSON.stringify(configData, null, 2), (err) => {
+			if (err) {
+				logger.error('Could not write db config to config file: ' + filename);
+				reject(err);
+			} else {
+				logger.debug('Wrote db configuration to config file: ' + filename);
+				resolve();
+			}
+		});
 	});
 }

--- a/backend/internal/certificate.js
+++ b/backend/internal/certificate.js
@ -1,5 +1,6 @@
 const _                  = require('lodash');
 const fs                 = require('fs');
+const https              = require('https');
 const tempWrite          = require('temp-write');
 const moment             = require('moment');
 const logger             = require('../logger').ssl;
@ -15,6 +16,7 @@ const letsencryptConfig  = '/etc/letsencrypt.ini';
 const certbotCommand     = 'certbot';
 const archiver           = require('archiver');
 const path               = require('path');
+const { isArray }        = require('lodash');

 function omissions() {
 	return ['is_deleted'];
@ -114,7 +116,7 @@ const internalCertificate = {
 				data.owner_user_id = access.token.getUserId(1);

 				if (data.provider === 'letsencrypt') {
-					data.nice_name = data.domain_names.sort().join(', ');
+					data.nice_name = data.domain_names.join(', ');
 				}

 				return certificateModel
@ -832,7 +834,7 @@ const internalCertificate = {
 	requestLetsEncryptSsl: (certificate) => {
 		logger.info('Requesting Let\'sEncrypt certificates for Cert #' + certificate.id + ': ' + certificate.domain_names.join(', '));

-		const cmd = certbotCommand + ' certonly --non-interactive ' +
+		const cmd = certbotCommand + ' certonly ' +
 			'--config "' + letsencryptConfig + '" ' +
 			'--cert-name "npm-' + certificate.id + '" ' +
 			'--agree-tos ' +
@ -874,7 +876,8 @@ const internalCertificate = {
 		// Whether the plugin has a --<name>-credentials argument
 		const hasConfigArg = certificate.meta.dns_provider !== 'route53';

-		let mainCmd = certbotCommand + ' certonly --non-interactive ' +
+		let mainCmd = certbotCommand + ' certonly ' +
+			'--config "' + letsencryptConfig + '" ' +
 			'--cert-name "npm-' + certificate.id + '" ' +
 			'--agree-tos ' +
 			'--email "' + certificate.meta.letsencrypt_email + '" ' +
@ -969,10 +972,11 @@ const internalCertificate = {
 	renewLetsEncryptSsl: (certificate) => {
 		logger.info('Renewing Let\'sEncrypt certificates for Cert #' + certificate.id + ': ' + certificate.domain_names.join(', '));

-		const cmd = certbotCommand + ' renew --force-renewal --non-interactive ' +
+		const cmd = certbotCommand + ' renew --force-renewal ' +
 			'--config "' + letsencryptConfig + '" ' +
 			'--cert-name "npm-' + certificate.id + '" ' +
 			'--preferred-challenges "dns,http" ' +
+			'--no-random-sleep-on-renew ' +
 			'--disable-hook-validation ' +
 			(letsencryptStaging ? '--staging' : '');

@ -998,9 +1002,11 @@ const internalCertificate = {

 		logger.info(`Renewing Let'sEncrypt certificates via ${dns_plugin.display_name} for Cert #${certificate.id}: ${certificate.domain_names.join(', ')}`);

-		let mainCmd = certbotCommand + ' renew --non-interactive ' +
+		let mainCmd = certbotCommand + ' renew ' +
+			'--config "' + letsencryptConfig + '" ' +
 			'--cert-name "npm-' + certificate.id + '" ' +
-			'--disable-hook-validation' +
+			'--disable-hook-validation ' +
+			'--no-random-sleep-on-renew ' +
 			(letsencryptStaging ? ' --staging' : '');

 		// Prepend the path to the credentials file as an environment variable
@ -1026,7 +1032,8 @@ const internalCertificate = {
 	revokeLetsEncryptSsl: (certificate, throw_errors) => {
 		logger.info('Revoking Let\'sEncrypt certificates for Cert #' + certificate.id + ': ' + certificate.domain_names.join(', '));

-		const mainCmd = certbotCommand + ' revoke --non-interactive ' +
+		const mainCmd = certbotCommand + ' revoke ' +
+			'--config "' + letsencryptConfig + '" ' +
 			'--cert-path "/etc/letsencrypt/live/npm-' + certificate.id + '/fullchain.pem" ' +
 			'--delete-after-revoke ' +
 			(letsencryptStaging ? '--staging' : '');
@ -1119,6 +1126,94 @@ const internalCertificate = {
 		} else {
 			return Promise.resolve();
 		}
+	},
+
+	testHttpsChallenge: async (access, domains) => {
+		await access.can('certificates:list');
+
+		if (!isArray(domains)) {
+			throw new error.InternalValidationError('Domains must be an array of strings');
+		}
+		if (domains.length === 0) {
+			throw new error.InternalValidationError('No domains provided');
+		}
+		
+		// Create a test challenge file
+		const testChallengeDir  = '/data/letsencrypt-acme-challenge/.well-known/acme-challenge';
+		const testChallengeFile = testChallengeDir + '/test-challenge';
+		fs.mkdirSync(testChallengeDir, {recursive: true});
+		fs.writeFileSync(testChallengeFile, 'Success', {encoding: 'utf8'});
+
+		async function performTestForDomain (domain) {
+			logger.info('Testing http challenge for ' + domain);
+			const url      = `http://${domain}/.well-known/acme-challenge/test-challenge`;
+			const formBody = `method=G&url=${encodeURI(url)}&bodytype=T&requestbody=&headername=User-Agent&headervalue=None&locationid=1&ch=false&cc=false`;
+			const options  = {
+				method:  'POST',
+				headers: {
+					'Content-Type':   'application/x-www-form-urlencoded',
+					'Content-Length': Buffer.byteLength(formBody)
+				}
+			};
+
+			const result = await new Promise((resolve) => {
+
+				const req = https.request('https://www.site24x7.com/tools/restapi-tester', options, function (res) {
+					let responseBody = '';
+
+					res.on('data', (chunk) => responseBody = responseBody + chunk);
+					res.on('end', function () {
+						const parsedBody = JSON.parse(responseBody + '');
+						if (res.statusCode !== 200) {
+							logger.warn(`Failed to test HTTP challenge for domain ${domain}`, res);
+							resolve(undefined);
+						}
+						resolve(parsedBody);
+					});
+				});
+
+				// Make sure to write the request body.
+				req.write(formBody);
+				req.end();
+				req.on('error', function (e) { logger.warn(`Failed to test HTTP challenge for domain ${domain}`, e);
+					resolve(undefined); });
+			});
+
+			if (!result) {
+				// Some error occurred while trying to get the data
+				return 'failed';
+			} else if (`${result.responsecode}` === '200' && result.htmlresponse === 'Success') {
+				// Server exists and has responded with the correct data
+				return 'ok';
+			} else if (`${result.responsecode}` === '200') {
+				// Server exists but has responded with wrong data
+				logger.info(`HTTP challenge test failed for domain ${domain} because of invalid returned data:`, result.htmlresponse);
+				return 'wrong-data';
+			} else if (`${result.responsecode}` === '404') {
+				// Server exists but responded with a 404
+				logger.info(`HTTP challenge test failed for domain ${domain} because code 404 was returned`);
+				return '404';
+			} else if (`${result.responsecode}` === '0' || (typeof result.reason === 'string' && result.reason.toLowerCase() === 'host unavailable')) {
+				// Server does not exist at domain
+				logger.info(`HTTP challenge test failed for domain ${domain} the host was not found`);
+				return 'no-host';
+			} else {
+				// Other errors
+				logger.info(`HTTP challenge test failed for domain ${domain} because code ${result.responsecode} was returned`);
+				return `other:${result.responsecode}`;
+			}
+		}
+
+		const results = {};
+
+		for (const domain of domains){
+			results[domain] = await performTestForDomain(domain);
+		}
+
+		// Remove the test challenge file
+		fs.unlinkSync(testChallengeFile);
+		
+		return results;
 	}
 };

--- a/backend/internal/host.js
+++ b/backend/internal/host.js
@ -1,8 +1,7 @@
-const _                       = require('lodash');
-const proxyHostModel          = require('../models/proxy_host');
-const redirectionHostModel    = require('../models/redirection_host');
-const deadHostModel           = require('../models/dead_host');
-const sslPassthroughHostModel = require('../models/ssl_passthrough_host');
+const _                    = require('lodash');
+const proxyHostModel       = require('../models/proxy_host');
+const redirectionHostModel = require('../models/redirection_host');
+const deadHostModel        = require('../models/dead_host');

 const internalHost = {

@ -82,9 +81,6 @@ const internalHost = {
 				.query()
 				.where('is_deleted', 0),
 			deadHostModel
-				.query()
-				.where('is_deleted', 0),
-			sslPassthroughHostModel
 				.query()
 				.where('is_deleted', 0)
 		];
@ -116,12 +112,6 @@ const internalHost = {
 					response_object.total_count += response_object.dead_hosts.length;
 				}

-				if (promises_results[3]) {
-					// SSL Passthrough Hosts
-					response_object.ssl_passthrough_hosts = internalHost._getHostsWithDomains(promises_results[3], domain_names);
-					response_object.total_count          += response_object.ssl_passthrough_hosts.length;
-				}
-
 				return response_object;
 			});
 	},
@ -147,11 +137,7 @@ const internalHost = {
 			deadHostModel
 				.query()
 				.where('is_deleted', 0)
-				.andWhere('domain_names', 'like', '%' + hostname + '%'),
-			sslPassthroughHostModel
-				.query()
-				.where('is_deleted', 0)
-				.andWhere('domain_name', '=', hostname),
+				.andWhere('domain_names', 'like', '%' + hostname + '%')
 		];

 		return Promise.all(promises)
@ -179,13 +165,6 @@ const internalHost = {
 					}
 				}

-				if (promises_results[3]) {
-					// SSL Passthrough Hosts
-					if (internalHost._checkHostnameRecordsTaken(hostname, promises_results[3], ignore_type === 'ssl_passthrough' && ignore_id ? ignore_id : 0)) {
-						is_taken = true;
-					}
-				}
-
 				return {
 					hostname: hostname,
 					is_taken: is_taken
@ -206,21 +185,14 @@ const internalHost = {

 		if (existing_rows && existing_rows.length) {
 			existing_rows.map(function (existing_row) {
-				
-				function checkHostname(existing_hostname) {
+				existing_row.domain_names.map(function (existing_hostname) {
 					// Does this domain match?
 					if (existing_hostname.toLowerCase() === hostname.toLowerCase()) {
 						if (!ignore_id || ignore_id !== existing_row.id) {
 							is_taken = true;
 						}
 					}
-				}
-
-				if (existing_row.domain_names) {
-					existing_row.domain_names.map(checkHostname);
-				} else if (existing_row.domain_name) {
-					checkHostname(existing_row.domain_name);
-				}
+				});
 			});
 		}

--- a/backend/internal/nginx.js
+++ b/backend/internal/nginx.js
@ -1,11 +1,10 @@
-const _                    = require('lodash');
-const fs                   = require('fs');
-const logger               = require('../logger').nginx;
-const utils                = require('../lib/utils');
-const error                = require('../lib/error');
-const { Liquid }           = require('liquidjs');
-const passthroughHostModel = require('../models/ssl_passthrough_host');
-const debug_mode           = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG;
+const _          = require('lodash');
+const fs         = require('fs');
+const logger     = require('../logger').nginx;
+const utils      = require('../lib/utils');
+const error      = require('../lib/error');
+const { Liquid } = require('liquidjs');
+const debug_mode = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG;

 const internalNginx = {

@ -24,8 +23,7 @@ const internalNginx = {
 	 * @returns {Promise}
 	 */
 	configure: (model, host_type, host) => {
-		let combined_meta           = {};
-		const sslPassthroughEnabled = internalNginx.sslPassthroughEnabled();
+		let combined_meta = {};

 		return internalNginx.test()
 			.then(() => {
@ -34,25 +32,7 @@ const internalNginx = {
 				return internalNginx.deleteConfig(host_type, host); // Don't throw errors, as the file may not exist at all
 			})
 			.then(() => {
-				if (host_type === 'ssl_passthrough_host' && !sslPassthroughEnabled){
-					// ssl passthrough is disabled
-					const meta = {
-						nginx_online: false,
-						nginx_err:    'SSL passthrough is not enabled in environment'
-					};
-
-					return passthroughHostModel
-						.query()
-						.where('is_deleted', 0)
-						.andWhere('enabled', 1)
-						.patch({
-							meta
-						}).then(() => {
-							return internalNginx.deleteConfig('ssl_passthrough_host', host, false); 
-						});
-				} else {
-					return internalNginx.generateConfig(host_type, host);
-				}
+				return internalNginx.generateConfig(host_type, host);
 			})
 			.then(() => {
 				// Test nginx again and update meta with result
@ -64,27 +44,12 @@ const internalNginx = {
 							nginx_err:    null
 						});

-						if (host_type === 'ssl_passthrough_host'){
-							// If passthrough is disabled we have already marked the hosts as offline
-							if (sslPassthroughEnabled) {
-								return passthroughHostModel
-									.query()
-									.where('is_deleted', 0)
-									.andWhere('enabled', 1)
-									.patch({
-										meta: combined_meta
-									});
-							}
-							return Promise.resolve();
-						}
-
 						return model
 							.query()
 							.where('id', host.id)
 							.patch({
 								meta: combined_meta
 							});
-						
 					})
 					.catch((err) => {
 						// Remove the error_log line because it's a docker-ism false positive that doesn't need to be reported.
@ -109,18 +74,6 @@ const internalNginx = {
 							nginx_err:    valid_lines.join('\n')
 						});

-						if (host_type === 'ssl_passthrough_host'){
-							return passthroughHostModel
-								.query()
-								.where('is_deleted', 0)
-								.andWhere('enabled', 1)
-								.patch({
-									meta: combined_meta
-								}).then(() => {
-									return internalNginx.deleteConfig('ssl_passthrough_host', host, true);
-								});
-						}
-
 						return model
 							.query()
 							.where('id', host.id)
@ -172,8 +125,6 @@ const internalNginx = {

 		if (host_type === 'default') {
 			return '/data/nginx/default_host/site.conf';
-		} else if (host_type === 'ssl_passthrough_host') {
-			return '/data/nginx/ssl_passthrough_host/hosts.conf';
 		}

 		return '/data/nginx/' + host_type + '/' + host_id + '.conf';
@ -235,7 +186,7 @@ const internalNginx = {
 	 * @param   {Object}  host
 	 * @returns {Promise}
 	 */
-	generateConfig: async (host_type, host) => {
+	generateConfig: (host_type, host) => {
 		host_type = host_type.replace(new RegExp('-', 'g'), '_');

 		if (debug_mode) {
@ -248,87 +199,72 @@ const internalNginx = {
 			root: __dirname + '/../templates/'
 		});

-		let template = null;
-		let filename = internalNginx.getConfigName(host_type, host.id);
+		return new Promise((resolve, reject) => {
+			let template = null;
+			let filename = internalNginx.getConfigName(host_type, host.id);

-		try {
-			template = fs.readFileSync(__dirname + '/../templates/' + host_type + '.conf', {encoding: 'utf8'});
-		} catch (err) {
-			throw new error.ConfigurationError(err.message);
-		}
-
-		let locationsPromise;
-		let origLocations;
-
-		// Manipulate the data a bit before sending it to the template
-		if (host_type === 'ssl_passthrough_host') {
-			if (internalNginx.sslPassthroughEnabled()){
-				const allHosts = await passthroughHostModel
-					.query()
-					.where('is_deleted', 0)
-					.groupBy('id')
-					.omit(['is_deleted']);
-				host           = {
-					all_passthrough_hosts: allHosts.map((host) => {
-						// Replace dots in domain
-						host.forwarding_host = internalNginx.addIpv6Brackets(host.forwarding_host);
-						return host;
-					}),
-				};
-			} else {
-				internalNginx.deleteConfig(host_type, host, false);
+			try {
+				template = fs.readFileSync(__dirname + '/../templates/' + host_type + '.conf', {encoding: 'utf8'});
+			} catch (err) {
+				reject(new error.ConfigurationError(err.message));
+				return;
 			}
-			
-		} else if (host_type !== 'default') {
-			host.use_default_location = true;
-			if (typeof host.advanced_config !== 'undefined' && host.advanced_config) {
-				host.use_default_location = !internalNginx.advancedConfigHasDefaultLocation(host.advanced_config);
-			}
-		}

-		if (host.locations) {
-			//logger.info ('host.locations = ' + JSON.stringify(host.locations, null, 2));
-			origLocations    = [].concat(host.locations);
-			locationsPromise = internalNginx.renderLocations(host).then((renderedLocations) => {
-				host.locations = renderedLocations;
-			});
+			let locationsPromise;
+			let origLocations;

-			// Allow someone who is using / custom location path to use it, and skip the default / location
-			_.map(host.locations, (location) => {
-				if (location.path === '/') {
-					host.use_default_location = false;
+			// Manipulate the data a bit before sending it to the template
+			if (host_type !== 'default') {
+				host.use_default_location = true;
+				if (typeof host.advanced_config !== 'undefined' && host.advanced_config) {
+					host.use_default_location = !internalNginx.advancedConfigHasDefaultLocation(host.advanced_config);
 				}
-			});
+			}

-		} else {
-			locationsPromise = Promise.resolve();
-		}
-
-		// Set the IPv6 setting for the host
-		host.ipv6 = internalNginx.ipv6Enabled();
-
-		return locationsPromise.then(() => {
-			renderEngine
-				.parseAndRender(template, host)
-				.then((config_text) => {
-					fs.writeFileSync(filename, config_text, {encoding: 'utf8'});
-
-					if (debug_mode) {
-						logger.success('Wrote config:', filename, config_text);
-					}
-
-					// Restore locations array
-					host.locations = origLocations;
-
-					return true;
-				})
-				.catch((err) => {
-					if (debug_mode) {
-						logger.warn('Could not write ' + filename + ':', err.message);
-					}
-
-					throw new error.ConfigurationError(err.message);
+			if (host.locations) {
+				//logger.info ('host.locations = ' + JSON.stringify(host.locations, null, 2));
+				origLocations    = [].concat(host.locations);
+				locationsPromise = internalNginx.renderLocations(host).then((renderedLocations) => {
+					host.locations = renderedLocations;
 				});
+
+				// Allow someone who is using / custom location path to use it, and skip the default / location
+				_.map(host.locations, (location) => {
+					if (location.path === '/') {
+						host.use_default_location = false;
+					}
+				});
+
+			} else {
+				locationsPromise = Promise.resolve();
+			}
+
+			// Set the IPv6 setting for the host
+			host.ipv6 = internalNginx.ipv6Enabled();
+
+			locationsPromise.then(() => {
+				renderEngine
+					.parseAndRender(template, host)
+					.then((config_text) => {
+						fs.writeFileSync(filename, config_text, {encoding: 'utf8'});
+
+						if (debug_mode) {
+							logger.success('Wrote config:', filename, config_text);
+						}
+
+						// Restore locations array
+						host.locations = origLocations;
+
+						resolve(true);
+					})
+					.catch((err) => {
+						if (debug_mode) {
+							logger.warn('Could not write ' + filename + ':', err.message);
+						}
+
+						reject(new error.ConfigurationError(err.message));
+					});
+			});
 		});
 	},

@ -493,33 +429,6 @@ const internalNginx = {
 		}

 		return true;
-	},
-
-	/**
-	 * @returns {boolean}
-	 */
-	sslPassthroughEnabled: function () {
-		if (typeof process.env.ENABLE_SSL_PASSTHROUGH !== 'undefined') {
-			const enabled = process.env.ENABLE_SSL_PASSTHROUGH.toLowerCase();
-			return (enabled === 'on' || enabled === 'true' || enabled === '1' || enabled === 'yes');
-		}
-
-		return false;
-	},
-
-	/**
-	 * Helper function to add brackets to an IP if it is IPv6
-	 * @returns {string}
-	 */
-	addIpv6Brackets: function (ip) {
-		// Only run check if ipv6 is enabled
-		if (internalNginx.ipv6Enabled()) {
-			const ipv6Regex = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/gi;
-			if (ipv6Regex.test(ip)){
-				return `[${ip}]`;
-			}
-		}
-		return ip;
 	}
 };

--- a/backend/internal/ssl-passthrough-host.js
+++ b/backend/internal/ssl-passthrough-host.js
@ -1,365 +0,0 @@
-const _                    = require('lodash');
-const error                = require('../lib/error');
-const passthroughHostModel = require('../models/ssl_passthrough_host');
-const internalHost         = require('./host');
-const internalNginx        = require('./nginx');
-const internalAuditLog     = require('./audit-log');
-
-function omissions () {
-	return ['is_deleted'];
-}
-
-const internalPassthroughHost = {
-
-	/**
-	 * @param   {Access}  access
-	 * @param   {Object}  data
-	 * @returns {Promise}
-	 */
-	create: (access, data) => {
-		return access.can('ssl_passthrough_hosts:create', data)
-			.then(() => {
-				// Get the domain name and check it against existing records
-				return internalHost.isHostnameTaken(data.domain_name)
-					.then((result) => {
-						if (result.is_taken) {
-							throw new error.ValidationError(result.hostname + ' is already in use');
-						}
-					});
-			}).then((/*access_data*/) => {
-				data.owner_user_id = access.token.getUserId(1);
-
-				if (typeof data.meta === 'undefined') {
-					data.meta = {};
-				}
-
-				return passthroughHostModel
-					.query()
-					.omit(omissions())
-					.insertAndFetch(data);
-			})
-			.then((row) => {
-				// Configure nginx
-				return internalNginx.configure(passthroughHostModel, 'ssl_passthrough_host', {})
-					.then(() => {
-						return internalPassthroughHost.get(access, {id: row.id, expand: ['owner']});
-					});
-			})
-			.then((row) => {
-				// Add to audit log
-				return internalAuditLog.add(access, {
-					action:      'created',
-					object_type: 'ssl-passthrough-host',
-					object_id:   row.id,
-					meta:        data
-				})
-					.then(() => {
-						return row;
-					});
-			});
-	},
-
-	/**
-	 * @param  {Access}  access
-	 * @param  {Object}  data
-	 * @param  {Number}  data.id
-	 * @return {Promise}
-	 */
-	update: (access, data) => {
-		return access.can('ssl_passthrough_hosts:update', data.id)
-			.then((/*access_data*/) => {
-				// Get the domain name and check it against existing records
-				if (typeof data.domain_name !== 'undefined') {
-					return internalHost.isHostnameTaken(data.domain_name, 'ssl_passthrough', data.id)
-						.then((result) => {
-							if (result.is_taken) {
-								throw new error.ValidationError(result.hostname + ' is already in use');
-							}
-						});
-				}
-			}).then((/*access_data*/) => {
-				return internalPassthroughHost.get(access, {id: data.id});
-			})
-			.then((row) => {
-				if (row.id !== data.id) {
-					// Sanity check that something crazy hasn't happened
-					throw new error.InternalValidationError('SSL Passthrough Host could not be updated, IDs do not match: ' + row.id + ' !== ' + data.id);
-				}
-
-				return passthroughHostModel
-					.query()
-					.omit(omissions())
-					.patchAndFetchById(row.id, data)
-					.then(() => {
-						return internalNginx.configure(passthroughHostModel, 'ssl_passthrough_host', {})
-							.then(() => {
-								return internalPassthroughHost.get(access, {id: row.id, expand: ['owner']});
-							});
-					})
-					.then((saved_row) => {
-						// Add to audit log
-						return internalAuditLog.add(access, {
-							action:      'updated',
-							object_type: 'ssl-passthrough-host',
-							object_id:   row.id,
-							meta:        data
-						})
-							.then(() => {
-								return _.omit(saved_row, omissions());
-							});
-					});
-			});
-	},
-
-	/**
-	 * @param  {Access}   access
-	 * @param  {Object}   data
-	 * @param  {Number}   data.id
-	 * @param  {Array}    [data.expand]
-	 * @param  {Array}    [data.omit]
-	 * @return {Promise}
-	 */
-	get: (access, data) => {
-		if (typeof data === 'undefined') {
-			data = {};
-		}
-
-		return access.can('ssl_passthrough_hosts:get', data.id)
-			.then((access_data) => {
-				let query = passthroughHostModel
-					.query()
-					.where('is_deleted', 0)
-					.andWhere('id', data.id)
-					.allowEager('[owner]')
-					.first();
-
-				if (access_data.permission_visibility !== 'all') {
-					query.andWhere('owner_user_id', access.token.getUserId(1));
-				}
-
-				// Custom omissions
-				if (typeof data.omit !== 'undefined' && data.omit !== null) {
-					query.omit(data.omit);
-				}
-
-				if (typeof data.expand !== 'undefined' && data.expand !== null) {
-					query.eager('[' + data.expand.join(', ') + ']');
-				}
-
-				return query;
-			})
-			.then((row) => {
-				if (row) {
-					return _.omit(row, omissions());
-				} else {
-					throw new error.ItemNotFoundError(data.id);
-				}
-			});
-	},
-
-	/**
-	 * @param {Access}  access
-	 * @param {Object}  data
-	 * @param {Number}  data.id
-	 * @param {String}  [data.reason]
-	 * @returns {Promise}
-	 */
-	delete: (access, data) => {
-		return access.can('ssl_passthrough_hosts:delete', data.id)
-			.then(() => {
-				return internalPassthroughHost.get(access, {id: data.id});
-			})
-			.then((row) => {
-				if (!row) {
-					throw new error.ItemNotFoundError(data.id);
-				}
-
-				return passthroughHostModel
-					.query()
-					.where('id', row.id)
-					.patch({
-						is_deleted: 1
-					})
-					.then(() => {
-						// Update Nginx Config
-						return internalNginx.configure(passthroughHostModel, 'ssl_passthrough_host', {})
-							.then(() => {
-								return internalNginx.reload();
-							});
-					})
-					.then(() => {
-						// Add to audit log
-						return internalAuditLog.add(access, {
-							action:      'deleted',
-							object_type: 'ssl-passthrough-host',
-							object_id:   row.id,
-							meta:        _.omit(row, omissions())
-						});
-					});
-			})
-			.then(() => {
-				return true;
-			});
-	},
-
-	/**
-	 * @param {Access}  access
-	 * @param {Object}  data
-	 * @param {Number}  data.id
-	 * @param {String}  [data.reason]
-	 * @returns {Promise}
-	 */
-	enable: (access, data) => {
-		return access.can('ssl_passthrough_hosts:update', data.id)
-			.then(() => {
-				return internalPassthroughHost.get(access, {
-					id:     data.id,
-					expand: ['owner']
-				});
-			})
-			.then((row) => {
-				if (!row) {
-					throw new error.ItemNotFoundError(data.id);
-				} else if (row.enabled) {
-					throw new error.ValidationError('Host is already enabled');
-				}
-
-				row.enabled = 1;
-
-				return passthroughHostModel
-					.query()
-					.where('id', row.id)
-					.patch({
-						enabled: 1
-					})
-					.then(() => {
-						// Configure nginx
-						return internalNginx.configure(passthroughHostModel, 'ssl_passthrough_host', {});
-					})
-					.then(() => {
-						// Add to audit log
-						return internalAuditLog.add(access, {
-							action:      'enabled',
-							object_type: 'ssl-passthrough-host',
-							object_id:   row.id,
-							meta:        _.omit(row, omissions())
-						});
-					});
-			})
-			.then(() => {
-				return true;
-			});
-	},
-
-	/**
-	 * @param {Access}  access
-	 * @param {Object}  data
-	 * @param {Number}  data.id
-	 * @param {String}  [data.reason]
-	 * @returns {Promise}
-	 */
-	disable: (access, data) => {
-		return access.can('ssl_passthrough_hosts:update', data.id)
-			.then(() => {
-				return internalPassthroughHost.get(access, {id: data.id});
-			})
-			.then((row) => {
-				if (!row) {
-					throw new error.ItemNotFoundError(data.id);
-				} else if (!row.enabled) {
-					throw new error.ValidationError('Host is already disabled');
-				}
-
-				row.enabled = 0;
-
-				return passthroughHostModel
-					.query()
-					.where('id', row.id)
-					.patch({
-						enabled: 0
-					})
-					.then(() => {
-						// Update Nginx Config
-						return internalNginx.configure(passthroughHostModel, 'ssl_passthrough_host', {})
-							.then(() => {
-								return internalNginx.reload();
-							});
-					})
-					.then(() => {
-						// Add to audit log
-						return internalAuditLog.add(access, {
-							action:      'disabled',
-							object_type: 'ssl-passthrough-host',
-							object_id:   row.id,
-							meta:        _.omit(row, omissions())
-						});
-					});
-			})
-			.then(() => {
-				return true;
-			});
-	},
-
-	/**
-	 * All SSL Passthrough Hosts
-	 *
-	 * @param   {Access}  access
-	 * @param   {Array}   [expand]
-	 * @param   {String}  [search_query]
-	 * @returns {Promise}
-	 */
-	getAll: (access, expand, search_query) => {
-		return access.can('ssl_passthrough_hosts:list')
-			.then((access_data) => {
-				let query = passthroughHostModel
-					.query()
-					.where('is_deleted', 0)
-					.groupBy('id')
-					.omit(['is_deleted'])
-					.allowEager('[owner]')
-					.orderBy('domain_name', 'ASC');
-
-				if (access_data.permission_visibility !== 'all') {
-					query.andWhere('owner_user_id', access.token.getUserId(1));
-				}
-
-				// Query is used for searching
-				if (typeof search_query === 'string') {
-					query.where(function () {
-						this.where('domain_name', 'like', '%' + search_query + '%');
-					});
-				}
-
-				if (typeof expand !== 'undefined' && expand !== null) {
-					query.eager('[' + expand.join(', ') + ']');
-				}
-
-				return query;
-			});
-	},
-
-	/**
-	 * Report use
-	 *
-	 * @param   {Number}  user_id
-	 * @param   {String}  visibility
-	 * @returns {Promise}
-	 */
-	getCount: (user_id, visibility) => {
-		let query = passthroughHostModel
-			.query()
-			.count('id as count')
-			.where('is_deleted', 0);
-
-		if (visibility !== 'all') {
-			query.andWhere('owner_user_id', user_id);
-		}
-
-		return query.first()
-			.then((row) => {
-				return parseInt(row.count, 10);
-			});
-	}
-};
-
-module.exports = internalPassthroughHost;
--- a/backend/internal/user.js
+++ b/backend/internal/user.js
@ -62,15 +62,14 @@ const internalUser = {
 				return userPermissionModel
 					.query()
 					.insert({
-						user_id:               user.id,
-						visibility:            is_admin ? 'all' : 'user',
-						proxy_hosts:           'manage',
-						redirection_hosts:     'manage',
-						dead_hosts:            'manage',
-						ssl_passthrough_hosts: 'manage',
-						streams:               'manage',
-						access_lists:          'manage',
-						certificates:          'manage'
+						user_id:           user.id,
+						visibility:        is_admin ? 'all' : 'user',
+						proxy_hosts:       'manage',
+						redirection_hosts: 'manage',
+						dead_hosts:        'manage',
+						streams:           'manage',
+						access_lists:      'manage',
+						certificates:      'manage'
 					})
 					.then(() => {
 						return internalUser.get(access, {id: user.id, expand: ['permissions']});
--- a/backend/lib/access/ssl_passthrough_hosts-create.json
+++ b/backend/lib/access/ssl_passthrough_hosts-create.json
@ -1,23 +0,0 @@
-{
-	"anyOf": [
-		{
-			"$ref": "roles#/definitions/admin"
-		},
-		{
-			"type": "object",
-			"required": ["permission_ssl_passthrough_hosts", "roles"],
-			"properties": {
-				"permission_ssl_passthrough_hosts": {
-					"$ref": "perms#/definitions/manage"
-				},
-				"roles": {
-					"type": "array",
-					"items": {
-						"type": "string",
-						"enum": ["user"]
-					}
-				}
-			}
-		}
-	]
-}
--- a/backend/lib/access/ssl_passthrough_hosts-delete.json
+++ b/backend/lib/access/ssl_passthrough_hosts-delete.json
@ -1,23 +0,0 @@
-{
-	"anyOf": [
-		{
-			"$ref": "roles#/definitions/admin"
-		},
-		{
-			"type": "object",
-			"required": ["permission_ssl_passthrough_hosts", "roles"],
-			"properties": {
-				"permission_ssl_passthrough_hosts": {
-					"$ref": "perms#/definitions/manage"
-				},
-				"roles": {
-					"type": "array",
-					"items": {
-						"type": "string",
-						"enum": ["user"]
-					}
-				}
-			}
-		}
-	]
-}
--- a/backend/lib/access/ssl_passthrough_hosts-get.json
+++ b/backend/lib/access/ssl_passthrough_hosts-get.json
@ -1,23 +0,0 @@
-{
-	"anyOf": [
-		{
-			"$ref": "roles#/definitions/admin"
-		},
-		{
-			"type": "object",
-			"required": ["permission_ssl_passthrough_hosts", "roles"],
-			"properties": {
-				"permission_ssl_passthrough_hosts": {
-					"$ref": "perms#/definitions/view"
-				},
-				"roles": {
-					"type": "array",
-					"items": {
-						"type": "string",
-						"enum": ["user"]
-					}
-				}
-			}
-		}
-	]
-}
--- a/backend/lib/access/ssl_passthrough_hosts-list.json
+++ b/backend/lib/access/ssl_passthrough_hosts-list.json
@ -1,23 +0,0 @@
-{
-	"anyOf": [
-		{
-			"$ref": "roles#/definitions/admin"
-		},
-		{
-			"type": "object",
-			"required": ["permission_ssl_passthrough_hosts", "roles"],
-			"properties": {
-				"permission_ssl_passthrough_hosts": {
-					"$ref": "perms#/definitions/view"
-				},
-				"roles": {
-					"type": "array",
-					"items": {
-						"type": "string",
-						"enum": ["user"]
-					}
-				}
-			}
-		}
-	]
-}
--- a/backend/lib/access/ssl_passthrough_hosts-update.json
+++ b/backend/lib/access/ssl_passthrough_hosts-update.json
@ -1,23 +0,0 @@
-{
-	"anyOf": [
-		{
-			"$ref": "roles#/definitions/admin"
-		},
-		{
-			"type": "object",
-			"required": ["permission_ssl_passthrough_hosts", "roles"],
-			"properties": {
-				"permission_ssl_passthrough_hosts": {
-					"$ref": "perms#/definitions/manage"
-				},
-				"roles": {
-					"type": "array",
-					"items": {
-						"type": "string",
-						"enum": ["user"]
-					}
-				}
-			}
-		}
-	]
-}
--- a/backend/migrations/20211010141200_ssl_passthrough_host.js
+++ b/backend/migrations/20211010141200_ssl_passthrough_host.js
@ -1,85 +0,0 @@
-const migrate_name = 'ssl_passthrough_host';
-const logger       = require('../logger').migrate;
-
-/**
-	* Migrate
-	*
-	* @see http://knexjs.org/#Schema
-	*
-	* @param   {Object} knex
-	* @param   {Promise} Promise
-	* @returns {Promise}
-	*/
-exports.up = async function (knex/*, Promise*/) {
-	logger.info('[' + migrate_name + '] Migrating Up...');
-
-	await knex.schema.createTable('ssl_passthrough_host', (table) => {
-		table.increments().primary();
-		table.dateTime('created_on').notNull();
-		table.dateTime('modified_on').notNull();
-		table.integer('owner_user_id').notNull().unsigned();
-		table.integer('is_deleted').notNull().unsigned().defaultTo(0);
-		table.string('domain_name').notNull();
-		table.string('forwarding_host').notNull();
-		table.integer('forwarding_port').notNull().unsigned();
-		table.integer('enabled').notNull().unsigned().defaultTo(1);
-		table.json('meta').notNull();
-	});
-
-	logger.info('[' + migrate_name + '] Table created');
-
-	// Remove unique constraint so name can be used for new table
-	await knex.schema.alterTable('user_permission', (table) => {
-		table.dropUnique('user_id');
-	});
-
-	await knex.schema.renameTable('user_permission', 'user_permission_old');
-
-	// We need to recreate the table since sqlite does not support altering columns
-	await knex.schema.createTable('user_permission', (table) => {
-		table.increments().primary();
-		table.dateTime('created_on').notNull();
-		table.dateTime('modified_on').notNull();
-		table.integer('user_id').notNull().unsigned();
-		table.string('visibility').notNull();
-		table.string('proxy_hosts').notNull();
-		table.string('redirection_hosts').notNull();
-		table.string('dead_hosts').notNull();
-		table.string('streams').notNull();
-		table.string('ssl_passthrough_hosts').notNull();
-		table.string('access_lists').notNull();
-		table.string('certificates').notNull();
-		table.unique('user_id');
-	});
-
-	await knex('user_permission_old').select('*', 'streams as ssl_passthrough_hosts').then((data) => {
-		if (data.length) {
-			return knex('user_permission').insert(data);
-		}
-		return Promise.resolve();
-	});
-
-	await knex.schema.dropTableIfExists('user_permission_old');
-
-	logger.info('[' + migrate_name + '] permissions updated');
-};
-
-/**
-	* Undo Migrate
-	*
-	* @param   {Object} knex
-	* @param   {Promise} Promise
-	* @returns {Promise}
-	*/
-exports.down = function (knex/*, Promise*/) {
-	logger.info('[' + migrate_name + '] Migrating Down...');
-
-	return knex.schema.dropTable('stream').then(() => {
-		return knex.schema.table('user_permission', (table) => {
-			table.dropColumn('ssl_passthrough_hosts');
-		});
-	})
-		.then(function () {
-			logger.info('[' + migrate_name + '] Table altered and permissions updated');
-		});
-};
--- a/backend/migrations/20211108145214_regenerate_default_host.js
+++ b/backend/migrations/20211108145214_regenerate_default_host.js
@ -0,0 +1,50 @@
+const migrate_name  = 'stream_domain';
+const logger        = require('../logger').migrate;
+const internalNginx = require('../internal/nginx');
+
+async function regenerateDefaultHost(knex) {
+	const row = await knex('setting').select('*').where('id', 'default-site').first();
+
+	if (!row) {
+		return Promise.resolve();
+	}
+
+	return internalNginx.deleteConfig('default')
+		.then(() => {
+			return internalNginx.generateConfig('default', row);
+		})
+		.then(() => {
+			return internalNginx.test();
+		})
+		.then(() => {
+			return internalNginx.reload();
+		});
+}
+
+/**
+	* Migrate
+	*
+	* @see http://knexjs.org/#Schema
+	*
+	* @param   {Object} knex
+	* @param   {Promise} Promise
+	* @returns {Promise}
+	*/
+exports.up = function (knex) {
+	logger.info('[' + migrate_name + '] Migrating Up...');
+
+	return regenerateDefaultHost(knex);
+};
+
+/**
+	* Undo Migrate
+	*
+	* @param   {Object} knex
+	* @param   {Promise} Promise
+	* @returns {Promise}
+	*/
+exports.down = function (knex) {
+	logger.info('[' + migrate_name + '] Migrating Down...');
+
+	return regenerateDefaultHost(knex);
+};
--- a/backend/models/ssl_passthrough_host.js
+++ b/backend/models/ssl_passthrough_host.js
@ -1,56 +0,0 @@
-// Objection Docs:
-// http://vincit.github.io/objection.js/
-
-const db    = require('../db');
-const Model = require('objection').Model;
-const User  = require('./user');
-const now   = require('./now_helper');
-
-Model.knex(db);
-
-class SslPassthrougHost extends Model {
-	$beforeInsert () {
-		this.created_on  = now();
-		this.modified_on = now();
-
-		// Default for meta
-		if (typeof this.meta === 'undefined') {
-			this.meta = {};
-		}
-	}
-
-	$beforeUpdate () {
-		this.modified_on = now();
-	}
-
-	static get name () {
-		return 'SslPassthrougHost';
-	}
-
-	static get tableName () {
-		return 'ssl_passthrough_host';
-	}
-
-	static get jsonAttributes () {
-		return ['meta'];
-	}
-
-	static get relationMappings () {
-		return {
-			owner: {
-				relation:   Model.HasOneRelation,
-				modelClass: User,
-				join:       {
-					from: 'ssl_passthrough_host.owner_user_id',
-					to:   'user.id'
-				},
-				modify: function (qb) {
-					qb.where('user.is_deleted', 0);
-					qb.omit(['id', 'created_on', 'modified_on', 'is_deleted', 'email', 'roles']);
-				}
-			}
-		};
-	}
-}
-
-module.exports = SslPassthrougHost;
--- a/backend/package.json
+++ b/backend/package.json
@ -11,11 +11,9 @@
 		"body-parser": "^1.19.0",
 		"compression": "^1.7.4",
 		"config": "^3.3.1",
-		"diskdb": "^0.1.17",
 		"express": "^4.17.1",
 		"express-fileupload": "^1.1.9",
 		"gravatar": "^1.8.0",
-		"html-entities": "^1.2.1",
 		"json-schema-ref-parser": "^8.0.0",
 		"jsonwebtoken": "^8.5.1",
 		"knex": "^0.20.13",
@ -27,12 +25,9 @@
 		"nodemon": "^2.0.2",
 		"objection": "^2.2.16",
 		"path": "^0.12.7",
-		"pg": "^7.12.1",
-		"restler": "^3.4.0",
 		"signale": "^1.4.0",
 		"sqlite3": "^4.1.1",
-		"temp-write": "^4.0.0",
-		"unix-timestamp": "^0.2.0"
+		"temp-write": "^4.0.0"
 	},
 	"signale": {
 		"displayDate": true,
--- a/backend/routes/api/main.js
+++ b/backend/routes/api/main.js
@ -1,7 +1,6 @@
-const express       = require('express');
-const pjson         = require('../../package.json');
-const error         = require('../../lib/error');
-const internalNginx = require('../../internal/nginx');
+const express = require('express');
+const pjson   = require('../../package.json');
+const error   = require('../../lib/error');

 let router = express.Router({
 	caseSensitive: true,
@ -35,18 +34,10 @@ router.use('/settings', require('./settings'));
 router.use('/nginx/proxy-hosts', require('./nginx/proxy_hosts'));
 router.use('/nginx/redirection-hosts', require('./nginx/redirection_hosts'));
 router.use('/nginx/dead-hosts', require('./nginx/dead_hosts'));
-router.use('/nginx/ssl-passthrough-hosts', require('./nginx/ssl_passthrough_hosts'));
 router.use('/nginx/streams', require('./nginx/streams'));
 router.use('/nginx/access-lists', require('./nginx/access_lists'));
 router.use('/nginx/certificates', require('./nginx/certificates'));

-router.get('/ssl-passthrough-enabled', (req, res/*, next*/) => {
-	res.status(200).send({
-		status:                  'OK',
-		ssl_passthrough_enabled: internalNginx.sslPassthroughEnabled()
-	});
-});
-
 /**
 * API 404 for all other routes
 *
--- a/backend/routes/api/nginx/certificates.js
+++ b/backend/routes/api/nginx/certificates.js
@ -68,6 +68,32 @@ router
 			.catch(next);
 	});

+/**
+ * Test HTTP challenge for domains
+ *
+ * /api/nginx/certificates/test-http
+ */
+router
+	.route('/test-http')
+	.options((req, res) => {
+		res.sendStatus(204);
+	})
+	.all(jwtdecode())
+
+/**
+ * GET /api/nginx/certificates/test-http
+ *
+ * Test HTTP challenge for domains
+ */
+	.get((req, res, next) => {
+		internalCertificate.testHttpsChallenge(res.locals.access, JSON.parse(req.query.domains))
+			.then((result) => {
+				res.status(200)
+					.send(result);
+			})
+			.catch(next);
+	});
+
 /**
 * Specific certificate
 *
@ -209,7 +235,6 @@ router
 			.catch(next);
 	});

-
 /**
 * Download LE Certs
 *
--- a/backend/routes/api/nginx/ssl_passthrough_hosts.js
+++ b/backend/routes/api/nginx/ssl_passthrough_hosts.js
@ -1,196 +0,0 @@
-const express                = require('express');
-const validator              = require('../../../lib/validator');
-const jwtdecode              = require('../../../lib/express/jwt-decode');
-const internalSslPassthrough = require('../../../internal/ssl-passthrough-host'); 
-const apiValidator           = require('../../../lib/validator/api');
-
-let router = express.Router({
-	caseSensitive: true,
-	strict:        true,
-	mergeParams:   true
-});
-
-/**
- * /api/nginx/ssl-passthrough-hosts
- */
-router
-	.route('/')
-	.options((req, res) => {
-		res.sendStatus(204);
-	})
-	.all(jwtdecode()) // preferred so it doesn't apply to nonexistent routes
-
-	/**
-	 * GET /api/nginx/ssl-passthrough-hosts
-	 *
-	 * Retrieve all ssl passthrough hosts
-	 */
-	.get((req, res, next) => {
-		validator({
-			additionalProperties: false,
-			properties:           {
-				expand: {
-					$ref: 'definitions#/definitions/expand'
-				},
-				query: {
-					$ref: 'definitions#/definitions/query'
-				}
-			}
-		}, {
-			expand: (typeof req.query.expand === 'string' ? req.query.expand.split(',') : null),
-			query:  (typeof req.query.query === 'string' ? req.query.query : null)
-		})
-			.then((data) => {
-				return internalSslPassthrough.getAll(res.locals.access, data.expand, data.query);
-			})
-			.then((rows) => {
-				res.status(200)
-					.send(rows);
-			})
-			.catch(next);
-	})
-
-	/**
-	 * POST /api/nginx/ssl-passthrough-hosts
-	 *
-	 * Create a new ssl passthrough host
-	 */
-	.post((req, res, next) => {
-		apiValidator({$ref: 'endpoints/ssl-passthrough-hosts#/links/1/schema'}, req.body)
-			.then((payload) => {
-				return internalSslPassthrough.create(res.locals.access, payload);
-			})
-			.then((result) => {
-				res.status(201)
-					.send(result);
-			})
-			.catch(next);
-	});
-
-/**
- * Specific ssl passthrough host
- *
- * /api/nginx/ssl-passthrough-hosts/123
- */
-router
-	.route('/:host_id')
-	.options((req, res) => {
-		res.sendStatus(204);
-	})
-	.all(jwtdecode()) // preferred so it doesn't apply to nonexistent routes
-
-	/**
-	 * GET /api/nginx/ssl-passthrough-hosts/123
-	 *
-	 * Retrieve a specific ssl passthrough host
-	 */
-	.get((req, res, next) => {
-		validator({
-			required:             ['host_id'],
-			additionalProperties: false,
-			properties:           {
-				host_id: {
-					$ref: 'definitions#/definitions/id'
-				},
-				expand: {
-					$ref: 'definitions#/definitions/expand'
-				}
-			}
-		}, {
-			host_id: req.params.host_id,
-			expand:  (typeof req.query.expand === 'string' ? req.query.expand.split(',') : null)
-		})
-			.then((data) => {
-				return internalSslPassthrough.get(res.locals.access, {
-					id:     parseInt(data.host_id, 10),
-					expand: data.expand
-				});
-			})
-			.then((row) => {
-				res.status(200)
-					.send(row);
-			})
-			.catch(next);
-	})
-
-	/**
-	 * PUT /api/nginx/ssl-passthrough-hosts/123
-	 *
-	 * Update an existing ssl passthrough host
-	 */
-	.put((req, res, next) => {
-		apiValidator({$ref: 'endpoints/ssl-passthrough-hosts#/links/2/schema'}, req.body)
-			.then((payload) => {
-				payload.id = parseInt(req.params.host_id, 10);
-				return internalSslPassthrough.update(res.locals.access, payload);
-			})
-			.then((result) => {
-				res.status(200)
-					.send(result);
-			})
-			.catch(next);
-	})
-
-	/**
-	 * DELETE /api/nginx/ssl-passthrough-hosts/123
-	 *
-	 * Delete an ssl passthrough host
-	 */
-	.delete((req, res, next) => {
-		internalSslPassthrough.delete(res.locals.access, {id: parseInt(req.params.host_id, 10)})
-			.then((result) => {
-				res.status(200)
-					.send(result);
-			})
-			.catch(next);
-	});
-
-/**
- * Enable ssl passthrough host
- *
- * /api/nginx/ssl-passthrough-hosts/123/enable
- */
-router
-	.route('/:host_id/enable')
-	.options((req, res) => {
-		res.sendStatus(204);
-	})
-	.all(jwtdecode())
-
-	/**
-	 * POST /api/nginx/ssl-passthrough-hosts/123/enable
-	 */
-	.post((req, res, next) => {
-		internalSslPassthrough.enable(res.locals.access, {id: parseInt(req.params.host_id, 10)})
-			.then((result) => {
-				res.status(200)
-					.send(result);
-			})
-			.catch(next);
-	});
-
-/**
- * Disable ssl passthrough host
- *
- * /api/nginx/ssl-passthrough-hosts/123/disable
- */
-router
-	.route('/:host_id/disable')
-	.options((req, res) => {
-		res.sendStatus(204);
-	})
-	.all(jwtdecode())
-
-	/**
-	 * POST /api/nginx/ssl-passthrough-hosts/123/disable
-	 */
-	.post((req, res, next) => {
-		internalSslPassthrough.disable(res.locals.access, {id: parseInt(req.params.host_id, 10)})
-			.then((result) => {
-				res.status(200)
-					.send(result);
-			})
-			.catch(next);
-	});
-
-module.exports = router;
--- a/backend/schema/endpoints/certificates.json
+++ b/backend/schema/endpoints/certificates.json
@ -157,6 +157,17 @@
      "targetSchema": {
        "type": "boolean"
      }
+    },
+    {
+      "title": "Test HTTP Challenge",
+      "description": "Tests whether the HTTP challenge should work",
+      "href": "/nginx/certificates/{definitions.identity.example}/test-http",
+      "access": "private",
+      "method": "GET",
+      "rel": "info",
+      "http_header": {
+        "$ref": "../examples.json#/definitions/auth_header"
+      }
    }
  ]
 }
--- a/backend/schema/endpoints/ssl-passthrough-hosts.json
+++ b/backend/schema/endpoints/ssl-passthrough-hosts.json
@ -1,208 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "endpoints/ssl-passthrough-hosts",
-  "title": "SSL Passthrough Hosts",
-  "description": "Endpoints relating to SSL Passthrough Hosts",
-  "stability": "stable",
-  "type": "object",
-  "definitions": {
-    "id": {
-      "$ref": "../definitions.json#/definitions/id"
-    },
-    "created_on": {
-      "$ref": "../definitions.json#/definitions/created_on"
-    },
-    "modified_on": {
-      "$ref": "../definitions.json#/definitions/modified_on"
-    },
-    "domain_name": {
-      "$ref": "../definitions.json#/definitions/domain_name"
-    },
-    "forwarding_host": {
-      "anyOf": [
-        {
-          "$ref": "../definitions.json#/definitions/domain_name"
-        },
-        {
-          "type": "string",
-          "format": "ipv4"
-        },
-        {
-          "type": "string",
-          "format": "ipv6"
-        }
-      ]
-    },
-    "forwarding_port": {
-      "type": "integer",
-      "minimum": 1,
-      "maximum": 65535
-    },
-    "enabled": {
-      "$ref": "../definitions.json#/definitions/enabled"
-    },
-    "meta": {
-      "type": "object"
-    }
-  },
-  "properties": {
-    "id": {
-      "$ref": "#/definitions/id"
-    },
-    "created_on": {
-      "$ref": "#/definitions/created_on"
-    },
-    "modified_on": {
-      "$ref": "#/definitions/modified_on"
-    },
-    "domain_name": {
-      "$ref": "#/definitions/domain_name"
-    },
-    "forwarding_host": {
-      "$ref": "#/definitions/forwarding_host"
-    },
-    "forwarding_port": {
-      "$ref": "#/definitions/forwarding_port"
-    },
-    "enabled": {
-      "$ref": "#/definitions/enabled"
-    },
-    "meta": {
-      "$ref": "#/definitions/meta"
-    }
-  },
-  "links": [
-    {
-      "title": "List",
-      "description": "Returns a list of SSL Passthrough Hosts",
-      "href": "/nginx/ssl-passthrough-hosts",
-      "access": "private",
-      "method": "GET",
-      "rel": "self",
-      "http_header": {
-        "$ref": "../examples.json#/definitions/auth_header"
-      },
-      "targetSchema": {
-        "type": "array",
-        "items": {
-          "$ref": "#/properties"
-        }
-      }
-    },
-    {
-      "title": "Create",
-      "description": "Creates a new SSL Passthrough Host",
-      "href": "/nginx/ssl-passthrough-hosts",
-      "access": "private",
-      "method": "POST",
-      "rel": "create",
-      "http_header": {
-        "$ref": "../examples.json#/definitions/auth_header"
-      },
-      "schema": {
-        "type": "object",
-        "additionalProperties": false,
-        "required": [
-          "domain_name",
-          "forwarding_host",
-          "forwarding_port"
-        ],
-        "properties": {
-          "domain_name": {
-            "$ref": "#/definitions/domain_name"
-          },
-          "forwarding_host": {
-            "$ref": "#/definitions/forwarding_host"
-          },
-          "forwarding_port": {
-            "$ref": "#/definitions/forwarding_port"
-          },
-          "meta": {
-            "$ref": "#/definitions/meta"
-          }
-        }
-      },
-      "targetSchema": {
-        "properties": {
-          "$ref": "#/properties"
-        }
-      }
-    },
-    {
-      "title": "Update",
-      "description": "Updates a existing SSL Passthrough Host",
-      "href": "/nginx/ssl-passthrough-hosts/{definitions.identity.example}",
-      "access": "private",
-      "method": "PUT",
-      "rel": "update",
-      "http_header": {
-        "$ref": "../examples.json#/definitions/auth_header"
-      },
-      "schema": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "domain_name": {
-            "$ref": "#/definitions/domain_name"
-          },
-          "forwarding_host": {
-            "$ref": "#/definitions/forwarding_host"
-          },
-          "forwarding_port": {
-            "$ref": "#/definitions/forwarding_port"
-          },
-          "meta": {
-            "$ref": "#/definitions/meta"
-          }
-        }
-      },
-      "targetSchema": {
-        "properties": {
-          "$ref": "#/properties"
-        }
-      }
-    },
-    {
-      "title": "Delete",
-      "description": "Deletes a existing SSL Passthrough Host",
-      "href": "/nginx/ssl-passthrough-hosts/{definitions.identity.example}",
-      "access": "private",
-      "method": "DELETE",
-      "rel": "delete",
-      "http_header": {
-        "$ref": "../examples.json#/definitions/auth_header"
-      },
-      "targetSchema": {
-        "type": "boolean"
-      }
-    },
-    {
-      "title": "Enable",
-      "description": "Enables a existing SSL Passthrough Host",
-      "href": "/nginx/ssl-passthrough-hosts/{definitions.identity.example}/enable",
-      "access": "private",
-      "method": "POST",
-      "rel": "update",
-      "http_header": {
-        "$ref": "../examples.json#/definitions/auth_header"
-      },
-      "targetSchema": {
-        "type": "boolean"
-      }
-    },
-    {
-      "title": "Disable",
-      "description": "Disables a existing SSL Passthrough Host",
-      "href": "/nginx/ssl-passthrough-hosts/{definitions.identity.example}/disable",
-      "access": "private",
-      "method": "POST",
-      "rel": "update",
-      "http_header": {
-        "$ref": "../examples.json#/definitions/auth_header"
-      },
-      "targetSchema": {
-        "type": "boolean"
-      }
-    }
-  ]
-}
--- a/backend/schema/index.json
+++ b/backend/schema/index.json
@ -26,9 +26,6 @@
    "dead-hosts": {
      "$ref": "endpoints/dead-hosts.json"
    },
-    "ssl-passthrough-hosts": {
-      "$ref": "endpoints/ssl-passthrough-hosts.json"
-    },
    "streams": {
      "$ref": "endpoints/streams.json"
    },
--- a/backend/setup.js
+++ b/backend/setup.js
@ -1,17 +1,15 @@
-const fs                   = require('fs');
-const NodeRSA              = require('node-rsa');
-const config               = require('config');
-const logger               = require('./logger').setup;
-const certificateModel     = require('./models/certificate');
-const userModel            = require('./models/user');
-const userPermissionModel  = require('./models/user_permission');
-const utils                = require('./lib/utils');
-const authModel            = require('./models/auth');
-const settingModel         = require('./models/setting');
-const passthroughHostModel = require('./models/ssl_passthrough_host');
-const dns_plugins          = require('./global/certbot-dns-plugins');
-const internalNginx        = require('./internal/nginx');
-const debug_mode           = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG;
+const fs                  = require('fs');
+const NodeRSA             = require('node-rsa');
+const config              = require('config');
+const logger              = require('./logger').setup;
+const certificateModel    = require('./models/certificate');
+const userModel           = require('./models/user');
+const userPermissionModel = require('./models/user_permission');
+const utils               = require('./lib/utils');
+const authModel           = require('./models/auth');
+const settingModel        = require('./models/setting');
+const dns_plugins         = require('./global/certbot-dns-plugins');
+const debug_mode          = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG;

 /**
 * Creates a new JWT RSA Keypair if not alread set on the config
@ -107,15 +105,14 @@ const setupDefaultUser = () => {
 							})
 							.then(() => {
 								return userPermissionModel.query().insert({
-									user_id:               user.id,
-									visibility:            'all',
-									proxy_hosts:           'manage',
-									redirection_hosts:     'manage',
-									dead_hosts:            'manage',
-									ssl_passthrough_hosts: 'manage',
-									streams:               'manage',
-									access_lists:          'manage',
-									certificates:          'manage',
+									user_id:           user.id,
+									visibility:        'all',
+									proxy_hosts:       'manage',
+									redirection_hosts: 'manage',
+									dead_hosts:        'manage',
+									streams:           'manage',
+									access_lists:      'manage',
+									certificates:      'manage',
 								});
 							});
 					})
@ -225,19 +222,10 @@ const setupLogrotation = () => {
 	return runLogrotate();
 };

-/**
- * Makes sure the ssl passthrough option is reflected in the nginx config
- * @returns {Promise}
- */
-const setupSslPassthrough = () => {
-	return internalNginx.configure(passthroughHostModel, 'ssl_passthrough_host', {});
-};
-
 module.exports = function () {
 	return setupJwt()
 		.then(setupDefaultUser)
 		.then(setupDefaultSettings)
 		.then(setupCertbotPlugins)
-		.then(setupLogrotation)
-		.then(setupSslPassthrough);
+		.then(setupLogrotation);
 };
--- a/backend/templates/_location.conf
+++ b/backend/templates/_location.conf
@ -1,11 +1,10 @@
  location {{ path }} {
-    set              $upstream {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }};
    proxy_set_header Host $host;
    proxy_set_header X-Forwarded-Scheme $scheme;
    proxy_set_header X-Forwarded-Proto  $scheme;
    proxy_set_header X-Forwarded-For    $remote_addr;
    proxy_set_header X-Real-IP		$remote_addr;
-    proxy_pass       $upstream;
+    proxy_pass       {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }};

    {% if access_list_id > 0 %}
    {% if access_list.items.length > 0 %}
--- a/backend/templates/default.conf
+++ b/backend/templates/default.conf
@ -7,9 +7,9 @@
 server {
  listen 80 default;
 {% if ipv6 -%}
-  listen [::]:80;
+  listen [::]:80 default;
 {% else -%}
-  #listen [::]:80;
+  #listen [::]:80 default;
 {% endif %}
  server_name default-host.localhost;
  access_log /data/logs/default-host_access.log combined;
--- a/backend/templates/ssl_passthrough_host.conf
+++ b/backend/templates/ssl_passthrough_host.conf
@ -1,41 +0,0 @@
-# ------------------------------------------------------------
-# SSL Passthrough hosts
-# ------------------------------------------------------------
-
-map $ssl_preread_server_name $name {
-{% for host in all_passthrough_hosts %}
-{% if host.enabled %}
-  {{ host.domain_name }} ssl_passthrough_{{ host.domain_name }};
-{% endif %}
-{% endfor %}
-  default https_default_backend;
-}
-
-{% for host in all_passthrough_hosts %}
-{% if host.enabled %}
-upstream ssl_passthrough_{{ host.domain_name }} {
-  server {{host.forwarding_host}}:{{host.forwarding_port}};
-}
-{% endif %}
-{% endfor %}
-
-upstream https_default_backend {
-    server 127.0.0.1:443;
-}
-
-server {
-  listen 444;
-{% if ipv6 -%}
-  listen [::]:444;
-{% else -%}
-  #listen [::]:444;
-{% endif %}
-
-  proxy_pass $name;
-  ssl_preread on;
-
-  error_log /data/logs/ssl-passthrough-hosts_error.log warn;
-
-  # Custom
-  include /data/nginx/custom/server_ssl_passthrough[.]conf;
-}
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@ -136,11 +136,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
    "@types/color-name" "^1.1.1"
    color-convert "^2.0.1"

-ansi-styles@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
-  integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
-
 anymatch@~3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
@ -391,11 +386,6 @@ buffer-equal-constant-time@1.0.1:
  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=

-buffer-writer@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
-  integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==
-
 buffer@^5.5.0:
  version "5.7.1"
  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
@ -464,15 +454,6 @@ camelcase@^5.0.0, camelcase@^5.3.1:
  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==

-chalk@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  integrity sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=
-  dependencies:
-    ansi-styles "~1.0.0"
-    has-color "~0.1.0"
-    strip-ansi "~0.1.0"
-
 chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.2:
  version "2.4.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@ -858,15 +839,6 @@ dicer@0.3.0:
  dependencies:
    streamsearch "0.1.2"

-diskdb@^0.1.17:
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/diskdb/-/diskdb-0.1.17.tgz#8abd095196b33b406791f1494b6b13b4422240c4"
-  integrity sha1-ir0JUZazO0BnkfFJS2sTtEIiQMQ=
-  dependencies:
-    chalk "^0.4.0"
-    merge "^1.1.3"
-    node-uuid "^1.4.1"
-
 doctrine@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@ -1501,11 +1473,6 @@ gravatar@^1.8.0:
    querystring "0.2.0"
    yargs "^15.4.1"

-has-color@~0.1.0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
-  integrity sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=
-
 has-flag@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@ -1564,11 +1531,6 @@ homedir-polyfill@^1.0.1:
  dependencies:
    parse-passwd "^1.0.0"

-html-entities@^1.2.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
-  integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
-
 http-cache-semantics@^4.0.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
@ -1596,11 +1558,6 @@ http-errors@~1.7.2:
    statuses ">= 1.5.0 < 2"
    toidentifier "1.0.0"

-iconv-lite@0.2.11:
-  version "0.2.11"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8"
-  integrity sha1-HOYKOleGSiktEyH/RgnKS7llrcg=
-
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
  version "0.4.24"
  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@ -2221,11 +2178,6 @@ merge-descriptors@1.0.1:
  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=

-merge@^1.1.3:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
-
 methods@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@ -2444,11 +2396,6 @@ node-rsa@^1.0.8:
  dependencies:
    asn1 "^0.2.4"

-node-uuid@^1.4.1:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-  integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
-
 nodemon@^2.0.2:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.4.tgz#55b09319eb488d6394aa9818148c0c2d1c04c416"
@ -2689,11 +2636,6 @@ package-json@^6.3.0:
    registry-url "^5.0.0"
    semver "^6.2.0"

-packet-reader@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74"
-  integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==
-
 parent-module@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@ -2783,63 +2725,11 @@ path@^0.12.7:
    process "^0.11.1"
    util "^0.10.3"

-pg-connection-string@0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
-  integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=
-
 pg-connection-string@2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.1.0.tgz#e07258f280476540b24818ebb5dca29e101ca502"
  integrity sha512-bhlV7Eq09JrRIvo1eKngpwuqKtJnNhZdpdOlvrPrA4dxqXPjxSrbNrfnIDmTpwMyRszrcV4kU5ZA4mMsQUrjdg==

-pg-int8@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
-  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
-
-pg-packet-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914"
-  integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg==
-
-pg-pool@^2.0.10:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a"
-  integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==
-
-pg-types@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
-  integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
-  dependencies:
-    pg-int8 "1.0.1"
-    postgres-array "~2.0.0"
-    postgres-bytea "~1.0.0"
-    postgres-date "~1.0.4"
-    postgres-interval "^1.1.0"
-
-pg@^7.12.1:
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.2.tgz#4e219f05a00aff4db6aab1ba02f28ffa4513b0bb"
-  integrity sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA==
-  dependencies:
-    buffer-writer "2.0.0"
-    packet-reader "1.0.0"
-    pg-connection-string "0.1.3"
-    pg-packet-stream "^1.1.0"
-    pg-pool "^2.0.10"
-    pg-types "^2.1.0"
-    pgpass "1.x"
-    semver "4.3.2"
-
-pgpass@1.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306"
-  integrity sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=
-  dependencies:
-    split "^1.0.0"
-
 picomatch@^2.0.4, picomatch@^2.2.1:
  version "2.2.2"
  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
@ -2863,28 +2753,6 @@ posix-character-classes@^0.1.0:
  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=

-postgres-array@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
-  integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
-
-postgres-bytea@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
-  integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
-
-postgres-date@~1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.6.tgz#4925e8085b30c2ba1a06ac91b9a3473954a2ce2d"
-  integrity sha512-o2a4gxeFcox+CgB3Ig/kNHBP23PiEXHCXx7pcIIsvzoNz4qv+lKTyiSkjOXIMNUl12MO/mOYl2K6wR9X5K6Plg==
-
-postgres-interval@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695"
-  integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==
-  dependencies:
-    xtend "^4.0.0"
-
 prelude-ls@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@ -2953,11 +2821,6 @@ pupa@^2.0.1:
  dependencies:
    escape-goat "^2.0.0"

-qs@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-1.2.0.tgz#ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"
-  integrity sha1-7Qeb4oaCFH5v2aNMwrDB4OxkU+4=
-
 qs@6.7.0:
  version "6.7.0"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
@ -3115,16 +2978,6 @@ responselike@^1.0.2:
  dependencies:
    lowercase-keys "^1.0.0"

-restler@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/restler/-/restler-3.4.0.tgz#741ec0b3d16b949feea2813d0c3c68529e888d9b"
-  integrity sha1-dB7As9FrlJ/uooE9DDxoUp6IjZs=
-  dependencies:
-    iconv-lite "0.2.11"
-    qs "1.2.0"
-    xml2js "0.4.0"
-    yaml "0.2.3"
-
 restore-cursor@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@ -3186,11 +3039,6 @@ safe-regex@^1.1.0:
  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

-sax@0.5.x:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
-
 sax@^1.2.4:
  version "1.2.4"
  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@ -3203,11 +3051,6 @@ semver-diff@^3.1.1:
  dependencies:
    semver "^6.3.0"

-semver@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
-  integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=
-
 semver@^5.3.0, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
  version "5.7.1"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@ -3360,13 +3203,6 @@ split-string@^3.0.1, split-string@^3.0.2:
  dependencies:
    extend-shallow "^3.0.0"

-split@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
-  dependencies:
-    through "2"
-
 sprintf-js@~1.0.2:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@ -3480,11 +3316,6 @@ strip-ansi@^6.0.0:
  dependencies:
    ansi-regex "^5.0.0"

-strip-ansi@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
-  integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=
-
 strip-bom@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@ -3579,7 +3410,7 @@ text-table@^0.2.0:
  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=

-through@2, through@^2.3.6:
+through@^2.3.6:
  version "2.3.8"
  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@ -3711,11 +3542,6 @@ unique-string@^2.0.0:
  dependencies:
    crypto-random-string "^2.0.0"

-unix-timestamp@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/unix-timestamp/-/unix-timestamp-0.2.0.tgz#e1cdc2808df6327d27e635d9351e72815288733e"
-  integrity sha1-4c3CgI32Mn0n5jXZNR5ygVKIcz4=
-
 unpipe@1.0.0, unpipe@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@ -3883,24 +3709,6 @@ xdg-basedir@^4.0.0:
  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==

-xml2js@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.0.tgz#124fc4114b4129c810800ecb2ac86cf25462cb9a"
-  integrity sha1-Ek/EEUtBKcgQgA7LKshs8lRiy5o=
-  dependencies:
-    sax "0.5.x"
-    xmlbuilder ">=0.4.2"
-
-xmlbuilder@>=0.4.2:
-  version "15.1.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
-  integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
-
-xtend@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
 y18n@^4.0.0:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
@ -3911,11 +3719,6 @@ yallist@^3.0.0, yallist@^3.1.1:
  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

-yaml@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-0.2.3.tgz#b5450e92e76ef36b5dd24e3660091ebaeef3e5c7"
-  integrity sha1-tUUOkudu82td0k42YAkeuu7z5cc=
-
 yargs-parser@^18.1.2:
  version "18.1.3"
  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@ -10,8 +10,7 @@ services:
    ports:
      - 3080:80
      - 3081:81
-      - 3443:443 # Ususally you would only have this one
-      - 3444:444 # This is to test ssl passthrough
+      - 3443:443
    networks:
      - nginx_proxy_manager
    environment:
@ -23,7 +22,6 @@ services:
      DB_MYSQL_USER: "npm"
      DB_MYSQL_PASSWORD: "npm"
      DB_MYSQL_NAME: "npm"
-      # ENABLE_SSL_PASSTHROUGH: "true"
      # DB_SQLITE_FILE: "/data/database.sqlite"
      # DISABLE_IPV6: "true"
    volumes:
@ -39,10 +37,10 @@ services:
  db:
    image: jc21/mariadb-aria
    container_name: npm_db
-    networks:
-      - nginx_proxy_manager
    ports:
      - 33306:3306
+    networks:
+      - nginx_proxy_manager
    environment:
      MYSQL_ROOT_PASSWORD: "npm"
      MYSQL_DATABASE: "npm"
@ -51,19 +49,6 @@ services:
    volumes:
      - db_data:/var/lib/mysql

-  swagger:
-    image: "swaggerapi/swagger-ui:latest"
-    container_name: npm_swagger
-    ports:
-      - 3001:80
-    networks:
-      - nginx_proxy_manager
-    environment:
-      URL: "http://127.0.0.1:3081/api/schema"
-      PORT: "80"
-    depends_on:
-      - npm
-
 volumes:
  npm_data:
    name: npm_core_data
--- a/docker/rootfs/etc/letsencrypt.ini
+++ b/docker/rootfs/etc/letsencrypt.ini
@ -3,3 +3,4 @@ non-interactive = True
 webroot-path = /data/letsencrypt-acme-challenge
 key-type = ecdsa
 elliptic-curve = secp384r1
+preferred-chain = ISRG Root X1
--- a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
@ -4,5 +4,5 @@ proxy_set_header X-Forwarded-Scheme $scheme;
 proxy_set_header X-Forwarded-Proto  $scheme;
 proxy_set_header X-Forwarded-For    $remote_addr;
 proxy_set_header X-Real-IP          $remote_addr;
-proxy_pass       $forward_scheme://$server:$port;
+proxy_pass       $forward_scheme://$server:$port$request_uri;

--- a/docker/rootfs/etc/nginx/nginx.conf
+++ b/docker/rootfs/etc/nginx/nginx.conf
@ -85,7 +85,6 @@ http {

 stream {
 	# Files generated by NPM
-	include /data/nginx/ssl_passthrough_host/hosts[.]conf;
 	include /data/nginx/stream/*.conf;

 	# Custom
--- a/docker/rootfs/etc/services.d/nginx/run
+++ b/docker/rootfs/etc/services.d/nginx/run
@ -12,7 +12,6 @@ mkdir -p /tmp/nginx/body \
 	/data/nginx/default_www \
 	/data/nginx/proxy_host \
 	/data/nginx/redirection_host \
-	/data/nginx/ssl_passthrough_host \
 	/data/nginx/stream \
 	/data/nginx/dead_host \
 	/data/nginx/temp \
--- a/docs/advanced-config/README.md
+++ b/docs/advanced-config/README.md
@ -172,28 +172,3 @@ value by specifying it as a Docker environment variable. The default if not spec
    X_FRAME_OPTIONS: "sameorigin"
  ...
 ```
-
-## SSL Passthrough
-
-SSL Passthrough will allow you to proxy a server without [SSL termination](https://en.wikipedia.org/wiki/TLS_termination_proxy). This means the SSL encryption of the server will be passed right through the proxy, retaining the original certificate.  
-
-Because of the SSL encryption the proxy does not know anything about the traffic and it just relies on an SSL feature called [Server Name Indication](https://en.wikipedia.org/wiki/Server_Name_Indication) to know where to send this network packet. This also means if the client does not provide this additional information, accessing the site through the proxy won't be possible. But most modern browsers include this information a HTTPS requests.
-
-Due to nginx constraints using SSL Passthrough comes with **a performance penalty for other hosts**, since all hosts (including normal proxy hosts) now have to pass through this additional step and basically being proxied twice. If you want to retain the upstream SSL certificate but do not need your service to be available on port 443, it is recommended to use a stream host instead.
-
-To enable SSL Passthrough on your npm instance you need to do two things: add the environment variable `ENABLE_SSL_PASSTHROUGH` with the value `"true"`, and expose port 444 instead of 443 to the outside as port 443.
-
-```yml
-version: '3'
-services:
-  app:
-    ...
-    ports:
-      - '80:80'
-      - '81:81'
-      - '443:444' # Expose internal port 444 instead of 443 as SSL port
-    environment:
-      ...
-      ENABLE_SSL_PASSTHROUGH: "true" # Enable SSL Passthrough
-    ...
-```
--- a/docs/setup/README.md
+++ b/docs/setup/README.md
@ -1,6 +1,44 @@
 # Full Setup Instructions

-## MySQL Database
+## Running the App
+
+Create a `docker-compose.yml` file:
+
+```yml
+version: "3"
+services:
+  app:
+    image: 'jc21/nginx-proxy-manager:latest'
+    restart: unless-stopped
+    ports:
+      # These ports are in format <host-port>:<container-port>
+      - '80:80' # Public HTTP Port
+      - '443:443' # Public HTTPS Port
+      - '81:81' # Admin Web Port
+      # Add any other Stream port you want to expose
+      # - '21:21' # FTP
+
+    # Uncomment the next line if you uncomment anything in the section
+    # environment:
+      # Uncomment this if you want to change the location of 
+      # the SQLite DB file within the container
+      # DB_SQLITE_FILE: "/data/database.sqlite"
+
+      # Uncomment this if IPv6 is not enabled on your host
+      # DISABLE_IPV6: 'true'
+
+    volumes:
+      - ./data:/data
+      - ./letsencrypt:/etc/letsencrypt
+```
+
+Then:
+
+```bash
+docker-compose up -d
+```
+
+## Using MySQL / MariaDB Database

 If you opt for the MySQL configuration you will have to provide the database server yourself. You can also use MariaDB. Here are the minimum supported versions:

@ -10,15 +48,7 @@ If you opt for the MySQL configuration you will have to provide the database ser
 It's easy to use another docker container for your database also and link it as part of the docker stack, so that's what the following examples
 are going to use.

-::: warning
-
-When using a `mariadb` database, the NPM configuration file should still use the `mysql` engine!
-
-:::
-
-## Running the App
-
-Via `docker-compose`:
+Here is an example of what your `docker-compose.yml` will look like when using a MariaDB container:

 ```yml
 version: "3"
@ -27,24 +57,18 @@ services:
    image: 'jc21/nginx-proxy-manager:latest'
    restart: unless-stopped
    ports:
-      # Public HTTP Port:
-      - '80:80'
-      # Public HTTPS Port:
-      - '443:443'
-      # Admin Web Port:
-      - '81:81'
+      # These ports are in format <host-port>:<container-port>
+      - '80:80' # Public HTTP Port
+      - '443:443' # Public HTTPS Port
+      - '81:81' # Admin Web Port
      # Add any other Stream port you want to expose
      # - '21:21' # FTP
    environment:
-      # These are the settings to access your db
      DB_MYSQL_HOST: "db"
      DB_MYSQL_PORT: 3306
      DB_MYSQL_USER: "npm"
      DB_MYSQL_PASSWORD: "npm"
      DB_MYSQL_NAME: "npm"
-      # If you would rather use Sqlite uncomment this
-      # and remove all DB_MYSQL_* lines above
-      # DB_SQLITE_FILE: "/data/database.sqlite"
      # Uncomment this if IPv6 is not enabled on your host
      # DISABLE_IPV6: 'true'
    volumes:
@ -52,6 +76,7 @@ services:
      - ./letsencrypt:/etc/letsencrypt
    depends_on:
      - db
+
  db:
    image: 'jc21/mariadb-aria:latest'
    restart: unless-stopped
@ -64,13 +89,11 @@ services:
      - ./data/mysql:/var/lib/mysql
 ```

-_Please note, that `DB_MYSQL_*` environment variables will take precedent over `DB_SQLITE_*` variables. So if you keep the MySQL variables, you will not be able to use Sqlite._
+::: warning

-Then:
+Please note, that `DB_MYSQL_*` environment variables will take precedent over `DB_SQLITE_*` variables. So if you keep the MySQL variables, you will not be able to use SQLite.

-```bash
-docker-compose up -d
-```
+:::

 ## Running on Raspberry PI / ARM devices

@ -89,57 +112,7 @@ for a list of supported architectures and if you want one that doesn't exist,
 Also, if you don't know how to already, follow [this guide to install docker and docker-compose](https://manre-universe.net/how-to-run-docker-and-docker-compose-on-raspbian/)
 on Raspbian.

-Via `docker-compose`:
-
-```yml
-version: "3"
-services:
-  app:
-    image: 'jc21/nginx-proxy-manager:latest'
-    restart: unless-stopped
-    ports:
-      # Public HTTP Port:
-      - '80:80'
-      # Public HTTPS Port:
-      - '443:443'
-      # Admin Web Port:
-      - '81:81'
-    environment:
-      # These are the settings to access your db
-      DB_MYSQL_HOST: "db"
-      DB_MYSQL_PORT: 3306
-      DB_MYSQL_USER: "changeuser"
-      DB_MYSQL_PASSWORD: "changepass"
-      DB_MYSQL_NAME: "npm"
-      # If you would rather use Sqlite uncomment this
-      # and remove all DB_MYSQL_* lines above
-      # DB_SQLITE_FILE: "/data/database.sqlite"
-      # Uncomment this if IPv6 is not enabled on your host
-      # DISABLE_IPV6: 'true'
-    volumes:
-      - ./data/nginx-proxy-manager:/data
-      - ./letsencrypt:/etc/letsencrypt
-    depends_on:
-      - db
-  db:
-    image: yobasystems/alpine-mariadb:latest
-    restart: unless-stopped
-    environment:
-      MYSQL_ROOT_PASSWORD: "changeme"
-      MYSQL_DATABASE: "npm"
-      MYSQL_USER: "changeuser"
-      MYSQL_PASSWORD: "changepass"
-    volumes:
-      - ./data/mariadb:/var/lib/mysql
-```
-
-_Please note, that `DB_MYSQL_*` environment variables will take precedent over `DB_SQLITE_*` var>
-
-Then:
-
-```bash
-docker-compose up -d
-```
+Please note that the `jc21/mariadb-aria:latest` image might have some problems on some ARM devices, if you want a separate database container, use the `yobasystems/alpine-mariadb:latest` image.

 ## Initial Run

--- a/frontend/js/app/api.js
+++ b/frontend/js/app/api.js
@ -515,76 +515,6 @@ module.exports = {
            }
        },

-        SslPassthroughHosts: {
-            /**
-             * @param   {Array}    [expand]
-             * @param   {String}   [query]
-             * @returns {Promise}
-             */
-            getFeatureEnabled: function () {
-                return fetch('get', 'ssl-passthrough-enabled');
-            },
-
-            /**
-             * @param   {Array}    [expand]
-             * @param   {String}   [query]
-             * @returns {Promise}
-             */
-            getAll: function (expand, query) {
-                return getAllObjects('nginx/ssl-passthrough-hosts', expand, query);
-            },
-
-            /**
-             * @param {Object}  data
-             */
-            create: function (data) {
-                return fetch('post', 'nginx/ssl-passthrough-hosts', data);
-            },
-
-            /**
-             * @param   {Object}   data
-             * @param   {Number}   data.id
-             * @returns {Promise}
-             */
-            update: function (data) {
-                let id = data.id;
-                delete data.id;
-                return fetch('put', 'nginx/ssl-passthrough-hosts/' + id, data);
-            },
-
-            /**
-             * @param   {Number}  id
-             * @returns {Promise}
-             */
-            delete: function (id) {
-                return fetch('delete', 'nginx/ssl-passthrough-hosts/' + id);
-            },
-
-            /**
-             * @param   {Number}  id
-             * @returns {Promise}
-             */
-            get: function (id) {
-                return fetch('get', 'nginx/ssl-passthrough-hosts/' + id);
-            },
-
-            /**
-             * @param   {Number}  id
-             * @returns {Promise}
-             */
-            enable: function (id) {
-                return fetch('post', 'nginx/ssl-passthrough-hosts/' + id + '/enable');
-            },
-
-            /**
-             * @param   {Number}  id
-             * @returns {Promise}
-             */
-            disable: function (id) {
-                return fetch('post', 'nginx/ssl-passthrough-hosts/' + id + '/disable');
-            }
-        },
-
        DeadHosts: {
            /**
             * @param   {Array}    [expand]
@ -755,6 +685,16 @@ module.exports = {
                return fetch('post', 'nginx/certificates/' + id + '/renew', undefined, {timeout});
            },

+            /**
+             * @param  {Number}  id
+             * @returns {Promise}
+             */
+            testHttpChallenge: function (domains) {
+                return fetch('get', 'nginx/certificates/test-http?' + new URLSearchParams({
+                    domains: JSON.stringify(domains),
+                }));
+            },
+
            /**
             * @param   {Number}  id
             * @returns {Promise}
--- a/frontend/js/app/controller.js
+++ b/frontend/js/app/controller.js
@ -221,46 +221,6 @@ module.exports = {
        }
    },

-     /**
-     * Nginx SSL Passthrough Hosts
-     */
-      showNginxSslPassthrough: function () {
-        if (Cache.User.isAdmin() || Cache.User.canView('ssl_passthrough_hosts')) {
-            let controller = this;
-
-            require(['./main', './nginx/ssl-passthrough/main'], (App, View) => {
-                controller.navigate('/nginx/ssl-passthrough');
-                App.UI.showAppContent(new View());
-            });
-        }
-    },
-
-    /**
-     * SSL Passthrough Hosts Form
-     *
-     * @param [model]
-     */
-     showNginxSslPassthroughForm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('ssl_passthrough_hosts')) {
-            require(['./main', './nginx/ssl-passthrough/form'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
-            });
-        }
-    },
-
-    /**
-     * SSL Passthrough Hosts Delete Confirm
-     *
-     * @param model
-     */
-     showNginxSslPassthroughDeleteConfirm: function (model) {
-        if (Cache.User.isAdmin() || Cache.User.canManage('ssl_passthrough_hosts')) {
-            require(['./main', './nginx/ssl-passthrough/delete'], function (App, View) {
-                App.UI.showModalDialog(new View({model: model}));
-            });
-        }
-    },
-
    /**
     * Nginx Dead Hosts
     */
@ -406,6 +366,19 @@ module.exports = {
        }
    },

+    /**
+     * 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
     */
--- a/frontend/js/app/nginx/certificates/form.ejs
+++ b/frontend/js/app/nginx/certificates/form.ejs
@ -18,6 +18,14 @@
                            <input type="text" name="domain_names" class="form-control" id="input-domains" value="<%- domain_names.join(',') %>" required>
                            <div class="text-blue"><i class="fe fe-alert-triangle"></i> <%- i18n('ssl', 'hosts-warning') %></div>
                        </div>
+
+                        <div class="mb-3 test-domains-container">
+                            <button type="button" class="btn btn-secondary test-domains col-sm-12"><%- i18n('certificates', 'test-reachability') %></button>
+                            <div class="text-secondary small">
+                                <i class="fe fe-info"></i> 
+                                <%- i18n('certificates', 'reachability-info') %>
+                            </div>
+                        </div>
                    </div>
                    <div class="col-sm-12 col-md-12">
                        <div class="form-group">
--- a/frontend/js/app/nginx/certificates/form.js
+++ b/frontend/js/app/nginx/certificates/form.js
@ -29,6 +29,8 @@ module.exports = Mn.View.extend({
        non_loader_content:                   '.non-loader-content',
        le_error_info:                        '#le-error-info',
        domain_names:                         'input[name="domain_names"]',
+        test_domains_container:               '.test-domains-container',
+        test_domains_button:                  '.test-domains',
        buttons:                              '.modal-footer button',
        cancel:                               'button.cancel',
        save:                                 'button.save',
@ -56,10 +58,12 @@ module.exports = Mn.View.extend({
                    this.ui.dns_provider_credentials.prop('required', 'required');
                }
                this.ui.dns_challenge_content.show();
+                this.ui.test_domains_container.hide();
            } else {
                this.ui.dns_provider.prop('required', false);
                this.ui.dns_provider_credentials.prop('required', false);
-                this.ui.dns_challenge_content.hide();                
+                this.ui.dns_challenge_content.hide();
+                this.ui.test_domains_container.show();            
            }
        },

@ -205,6 +209,23 @@ module.exports = Mn.View.extend({
                    this.ui.non_loader_content.show();
                });
        },
+        'click @ui.test_domains_button': function (e) {
+            e.preventDefault();
+            const domainNames = this.ui.domain_names[0].value.split(',');
+            if (domainNames && domainNames.length > 0) {
+                this.model.set('domain_names', domainNames);
+                this.model.set('back_to_add', true);
+                App.Controller.showNginxCertificateTestReachability(this.model);
+            }
+        },
+        'change @ui.domain_names': function(e){
+            const domainNames = e.target.value.split(',');
+            if (domainNames && domainNames.length > 0) {
+                this.ui.test_domains_button.prop('disabled', false);
+            } else {
+                this.ui.test_domains_button.prop('disabled', true);
+            }
+        },
        'change @ui.other_certificate_key': function(e){
            this.setFileName("other_certificate_key_label", e)
        },
@ -257,6 +278,12 @@ module.exports = Mn.View.extend({
        this.ui.credentials_file_content.hide(); 
        this.ui.loader_content.hide();
        this.ui.le_error_info.hide();
+        if (this.ui.domain_names[0]) {
+            const domainNames = this.ui.domain_names[0].value.split(',');
+            if (!domainNames || domainNames.length === 0 || (domainNames.length === 1 && domainNames[0] === "")) {
+                this.ui.test_domains_button.prop('disabled', true);
+            }
+        }
    },

    initialize: function (options) {
--- a/frontend/js/app/nginx/certificates/list/item.ejs
+++ b/frontend/js/app/nginx/certificates/list/item.ejs
@ -42,6 +42,9 @@
            <% if (provider === 'letsencrypt') { %>
                <a href="#" class="renew dropdown-item"><i class="dropdown-icon fe fe-refresh-cw"></i> <%- i18n('certificates', 'force-renew') %></a>
                <a href="#" class="download dropdown-item"><i class="dropdown-icon fe fe-download"></i> <%- i18n('certificates', 'download') %></a>
+                <% if (meta.dns_challenge === false) { %>
+                    <a href="#" class="test dropdown-item"><i class="dropdown-icon fe fe-globe"></i> <%- i18n('certificates', 'test-reachability') %></a>
+                <% } %>
                <div class="dropdown-divider"></div>
            <% } %>
            <a href="#" class="delete dropdown-item"><i class="dropdown-icon fe fe-trash-2"></i> <%- i18n('str', 'delete') %></a>
--- a/frontend/js/app/nginx/certificates/list/item.js
+++ b/frontend/js/app/nginx/certificates/list/item.js
@ -2,7 +2,7 @@ const Mn            = require('backbone.marionette');
 const moment        = require('moment');
 const App           = require('../../../main');
 const template      = require('./item.ejs');
-const dns_providers = require('../../../../../../global/certbot-dns-plugins')
+const dns_providers = require('../../../../../../global/certbot-dns-plugins');

 module.exports = Mn.View.extend({
    template: template,
@ -12,7 +12,8 @@ module.exports = Mn.View.extend({
        host_link: '.host-link',
        renew:     'a.renew',
        delete:    'a.delete',
-        download:  'a.download'
+        download:  'a.download',
+        test:      'a.test'
    },

    events: {
@ -31,11 +32,16 @@ module.exports = Mn.View.extend({
            let win = window.open($(e.currentTarget).attr('rel'), '_blank');
            win.focus();
        },
-        
+                
        'click @ui.download': function (e) {
            e.preventDefault();
-            App.Api.Nginx.Certificates.download(this.model.get('id'))
-        }
+            App.Api.Nginx.Certificates.download(this.model.get('id'));
+        },
+
+        'click @ui.test': function (e) {
+            e.preventDefault();
+            App.Controller.showNginxCertificateTestReachability(this.model);
+        },
    },

    templateContext: {
--- a/frontend/js/app/nginx/certificates/test.ejs
+++ b/frontend/js/app/nginx/certificates/test.ejs
@ -0,0 +1,15 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <h5 class="modal-title"><%- i18n('certificates', 'reachability-title') %></h5>
+    </div>
+    <div class="modal-body">
+        <div class="waiting text-center">
+            <%= i18n('str', 'please-wait') %>
+        </div>
+        <div class="alert alert-danger error" role="alert"></div>
+        <div class="alert alert-success success" role="alert"></div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-secondary cancel" disabled><%- i18n('str', 'close') %></button>
+    </div>
+</div>
--- a/frontend/js/app/nginx/certificates/test.js
+++ b/frontend/js/app/nginx/certificates/test.js
@ -0,0 +1,75 @@
+const Mn       = require('backbone.marionette');
+const App      = require('../../main');
+const template = require('./test.ejs');
+
+module.exports = Mn.View.extend({
+	template:  template,
+	className: 'modal-dialog',
+
+	ui: {
+		waiting: '.waiting',
+		error:   '.error',
+		success: '.success',
+		close:   'button.cancel'
+	},
+
+    events: {
+        'click @ui.close': function (e) {
+            e.preventDefault();
+            if (this.model.get('back_to_add')) {
+                App.Controller.showNginxCertificateForm(this.model);
+            } else {
+                App.UI.closeModal();
+            }
+        },
+    },
+
+	onRender: function () {
+		this.ui.error.hide();
+		this.ui.success.hide();
+
+		App.Api.Nginx.Certificates.testHttpChallenge(this.model.get('domain_names'))
+			.then((result) => {
+				let allOk = true;
+				let text  = '';
+
+				for (const domain in result) {
+					const status = result[domain];
+					if (status === 'ok') {
+						text += `<p><strong>${domain}:</strong> ${App.i18n('certificates', 'reachability-ok')}</p>`;
+					} else {
+						allOk = false;
+						if (status === 'no-host') {
+							text += `<p><strong>${domain}:</strong> ${App.i18n('certificates', 'reachability-not-resolved')}</p>`;
+						} else if (status === 'failed') {
+							text += `<p><strong>${domain}:</strong> ${App.i18n('certificates', 'reachability-failed-to-check')}</p>`;
+						} else if (status === '404') {
+							text += `<p><strong>${domain}:</strong> ${App.i18n('certificates', 'reachability-404')}</p>`;
+						} else if (status === 'wrong-data') {
+							text += `<p><strong>${domain}:</strong> ${App.i18n('certificates', 'reachability-wrong-data')}</p>`;
+						} else if (status.startsWith('other:')) {
+							const code = status.substring(6);
+							text      += `<p><strong>${domain}:</strong> ${App.i18n('certificates', 'reachability-other', {code})}</p>`;
+						} else {
+							// This should never happen
+							text += `<p><strong>${domain}:</strong> ?</p>`;
+						}
+					}
+				}
+
+				this.ui.waiting.hide();
+				if (allOk) {
+					this.ui.success.html(text).show();
+				} else {
+					this.ui.error.html(text).show();
+				}
+				this.ui.close.prop('disabled', false);
+			})
+			.catch((e) => {
+				console.error(e);
+				this.ui.waiting.hide();
+				this.ui.error.text(App.i18n('certificates', 'reachability-failed-to-reach-api')).show();
+				this.ui.close.prop('disabled', false);
+			});
+	}
+});
--- a/frontend/js/app/nginx/proxy/form.ejs
+++ b/frontend/js/app/nginx/proxy/form.ejs
@ -257,16 +257,17 @@
                <div role="tabpanel" class="tab-pane" id="advanced">
                    <div class="row">
                        <div class="col-md-12">
-                            <p>Nginx variables available to you are:</p>
+                            <p><%- i18n('all-hosts', 'advanced-config-var-headline') %></p>
                            <ul class="text-monospace">
-                                <li>$server          # Host/IP</li>
-                                <li>$port            # Port Number</li>
-                                <li>$forward_scheme  # http or https</li>
+                                <li><code>$server</code> <%- i18n('proxy-hosts', 'forward-host') %></li>
+                                <li><code>$port</code> <%- i18n('proxy-hosts', 'forward-port') %></li>
+                                <li><code>$forward_scheme</code> <%- i18n('proxy-hosts', 'forward-scheme') %></li>
                            </ul>
                            <div class="form-group mb-0">
                                <label class="form-label"><%- i18n('all-hosts', 'advanced-config') %></label>
                                <textarea name="advanced_config" rows="8" class="form-control text-monospace" placeholder="# <%- i18n('all-hosts', 'advanced-warning') %>"><%- advanced_config %></textarea>
                            </div>
+                            <p class="small text-gray"><i class="fe fe-alert-triangle"></i> <%- i18n('all-hosts', 'advanced-config-header-info') %></p>
                        </div>
                    </div>
                </div>
--- a/frontend/js/app/nginx/ssl-passthrough/delete.ejs
+++ b/frontend/js/app/nginx/ssl-passthrough/delete.ejs
@ -1,19 +0,0 @@
-<div class="modal-content">
-    <div class="modal-header">
-        <h5 class="modal-title"><%- i18n('ssl-passthrough-hosts', 'delete') %></h5>
-        <button type="button" class="close cancel" aria-label="Close" data-dismiss="modal">&nbsp;</button>
-    </div>
-    <div class="modal-body">
-        <form>
-            <div class="row">
-                <div class="col-sm-12 col-md-12">
-                    <%= i18n('ssl-passthrough-hosts', 'delete-confirm') %>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button type="button" class="btn btn-secondary cancel" data-dismiss="modal"><%- i18n('str', 'cancel') %></button>
-        <button type="button" class="btn btn-danger save"><%- i18n('str', 'sure') %></button>
-    </div>
-</div>
--- a/frontend/js/app/nginx/ssl-passthrough/delete.js
+++ b/frontend/js/app/nginx/ssl-passthrough/delete.js
@ -1,32 +0,0 @@
-const Mn       = require('backbone.marionette');
-const App      = require('../../main');
-const template = require('./delete.ejs');
-
-module.exports = Mn.View.extend({
-    template:  template,
-    className: 'modal-dialog',
-
-    ui: {
-        form:    'form',
-        buttons: '.modal-footer button',
-        cancel:  'button.cancel',
-        save:    'button.save'
-    },
-
-    events: {
-
-        'click @ui.save': function (e) {
-            e.preventDefault();
-
-            App.Api.Nginx.SslPassthroughHosts.delete(this.model.get('id'))
-                .then(() => {
-                    App.Controller.showNginxSslPassthrough();
-                    App.UI.closeModal();
-                })
-                .catch(err => {
-                    alert(err.message);
-                    this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
-                });
-        }
-    }
-});
--- a/frontend/js/app/nginx/ssl-passthrough/form.ejs
+++ b/frontend/js/app/nginx/ssl-passthrough/form.ejs
@ -1,34 +0,0 @@
-<div class="modal-content">
-    <div class="modal-header">
-        <h5 class="modal-title"><%- i18n('ssl-passthrough-hosts', 'form-title', {id: id}) %></h5>
-        <button type="button" class="close cancel" aria-label="Close" data-dismiss="modal">&nbsp;</button>
-    </div>
-    <div class="modal-body">
-        <form>
-            <div class="row">
-                <div class="col-sm-12 col-md-12">
-                    <div class="form-group">
-                        <label class="form-label"><%- i18n('all-hosts', 'domain-name') %> <span class="form-required">*</span></label>
-                        <input type="text" name="domain_name" class="form-control" id="input-domain" placeholder="example.com" value="<%- domain_name %>" required>
-                    </div>
-                </div>
-                <div class="col-sm-8 col-md-8">
-                    <div class="form-group">
-                        <label class="form-label"><%- i18n('ssl-passthrough-hosts', 'forwarding-host') %><span class="form-required">*</span></label>
-                        <input type="text" name="forwarding_host" class="form-control text-monospace" placeholder="example.com or 10.0.0.1 or 2001:db8:3333:4444:5555:6666:7777:8888" value="<%- forwarding_host %>" autocomplete="off" maxlength="255" required>
-                    </div>
-                </div>
-                <div class="col-sm-4 col-md-4">
-                    <div class="form-group">
-                        <label class="form-label"><%- i18n('ssl-passthrough-hosts', 'forwarding-port') %> <span class="form-required">*</span></label>
-                        <input name="forwarding_port" type="number" class="form-control text-monospace" placeholder="eg: 443" value="<%- forwarding_port %>" required>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button type="button" class="btn btn-secondary cancel" data-dismiss="modal"><%- i18n('str', 'cancel') %></button>
-        <button type="button" class="btn btn-teal save"><%- i18n('str', 'save') %></button>
-    </div>
-</div>
--- a/frontend/js/app/nginx/ssl-passthrough/form.js
+++ b/frontend/js/app/nginx/ssl-passthrough/form.js
@ -1,74 +0,0 @@
-const Mn                  = require('backbone.marionette');
-const App                 = require('../../main');
-const SslPassthroughModel = require('../../../models/ssl-passthrough-host');
-const template            = require('./form.ejs');
-
-require('jquery-serializejson');
-require('jquery-mask-plugin');
-require('selectize');
-
-module.exports = Mn.View.extend({
-    template:  template,
-    className: 'modal-dialog',
-
-    ui: {
-        form:            'form',
-        forwarding_host: 'input[name="forwarding_host"]',
-        buttons:         '.modal-footer button',
-        cancel:          'button.cancel',
-        save:            'button.save'
-    },
-
-    events: {
-        'change @ui.switches': function () {
-            this.ui.type_error.hide();
-        },
-
-        'click @ui.save': function (e) {
-            e.preventDefault();
-
-            if (!this.ui.form[0].checkValidity()) {
-                $('<input type="submit">').hide().appendTo(this.ui.form).click().remove();
-                return;
-            }
-
-            let view = this;
-            let data = this.ui.form.serializeJSON();
-
-            // Manipulate
-            data.forwarding_port = parseInt(data.forwarding_port, 10);
-
-            let method = App.Api.Nginx.SslPassthroughHosts.create;
-            let is_new = true;
-
-            if (this.model.get('id')) {
-                // edit
-                is_new  = false;
-                method  = App.Api.Nginx.SslPassthroughHosts.update;
-                data.id = this.model.get('id');
-            }
-
-            this.ui.buttons.prop('disabled', true).addClass('btn-disabled');
-            method(data)
-                .then(result => {
-                    view.model.set(result);
-
-                    App.UI.closeModal(function () {
-                        if (is_new) {
-                            App.Controller.showNginxSslPassthrough();
-                        }
-                    });
-                })
-                .catch(err => {
-                    alert(err.message);
-                    this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
-                });
-        }
-    },
-
-    initialize: function (options) {
-        if (typeof options.model === 'undefined' || !options.model) {
-            this.model = new SslPassthroughModel.Model();
-        }
-    }
-});
--- a/frontend/js/app/nginx/ssl-passthrough/list/item.ejs
+++ b/frontend/js/app/nginx/ssl-passthrough/list/item.ejs
@ -1,43 +0,0 @@
-<td class="text-center">
-    <div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
-        <span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
-    </div>
-</td>
-<td>
-    <div class="text-monospace">
-        <%- domain_name %>
-    </div>
-    <div class="small text-muted">
-        <%- i18n('str', 'created-on', {date: formatDbDate(created_on, 'Do MMMM YYYY')}) %>
-    </div>
-</td>
-<td>
-    <div class="text-monospace"><%- forwarding_host %>:<%- forwarding_port %></div>
-</td>
-<td>
-    <%
-    var o = isOnline();
-    if (!enabled) { %>
-        <span class="status-icon bg-warning"></span> <%- i18n('str', 'disabled') %>
-    <% } else if (o === true) { %>
-        <span class="status-icon bg-success"></span> <%- i18n('str', 'online') %>
-    <% } else if (o === false) { %>
-        <span title="<%- getOfflineError() %>"><span class="status-icon bg-danger"></span> <%- i18n('str', 'offline') %></span>
-    <% } else { %>
-        <span class="status-icon bg-warning"></span> <%- i18n('str', 'unknown') %>
-    <% } %>
-</td>
-<% if (canManage) { %>
-<td class="text-right">
-    <div class="item-action dropdown">
-        <a href="#" data-toggle="dropdown" class="icon"><i class="fe fe-more-vertical"></i></a>
-        <div class="dropdown-menu dropdown-menu-right">
-            <span class="dropdown-header"><%- i18n('audit-log', 'ssl-passthrough-host') %> #<%- id %></span>
-            <a href="#" class="edit dropdown-item"><i class="dropdown-icon fe fe-edit"></i> <%- i18n('str', 'edit') %></a>
-            <a href="#" class="able dropdown-item"><i class="dropdown-icon fe fe-power"></i> <%- i18n('str', enabled ? 'disable' : 'enable') %></a>
-            <div class="dropdown-divider"></div>
-            <a href="#" class="delete dropdown-item"><i class="dropdown-icon fe fe-trash-2"></i> <%- i18n('str', 'delete') %></a>
-        </div>
-    </div>
-</td>
-<% } %>
--- a/frontend/js/app/nginx/ssl-passthrough/list/item.js
+++ b/frontend/js/app/nginx/ssl-passthrough/list/item.js
@ -1,54 +0,0 @@
-const Mn       = require('backbone.marionette');
-const App      = require('../../../main');
-const template = require('./item.ejs');
-
-module.exports = Mn.View.extend({
-    template: template,
-    tagName:  'tr',
-
-    ui: {
-        able:   'a.able',
-        edit:   'a.edit',
-        delete: 'a.delete'
-    },
-
-    events: {
-        'click @ui.able': function (e) {
-            e.preventDefault();
-            let id = this.model.get('id');
-            App.Api.Nginx.SslPassthroughHosts[this.model.get('enabled') ? 'disable' : 'enable'](id)
-                .then(() => {
-                    return App.Api.Nginx.SslPassthroughHosts.get(id)
-                        .then(row => {
-                            this.model.set(row);
-                        });
-                });
-        },
-
-        'click @ui.edit': function (e) {
-            e.preventDefault();
-            App.Controller.showNginxSslPassthroughForm(this.model);
-        },
-
-        'click @ui.delete': function (e) {
-            e.preventDefault();
-            App.Controller.showNginxSslPassthroughDeleteConfirm(this.model);
-        }
-    },
-
-    templateContext: {
-        canManage: App.Cache.User.canManage('ssl_passthrough_hosts'),
-
-        isOnline: function () {
-            return typeof this.meta.nginx_online === 'undefined' ? null : this.meta.nginx_online;
-        },
-
-        getOfflineError: function () {
-            return this.meta.nginx_err || '';
-        }
-    },
-
-    initialize: function () {
-        this.listenTo(this.model, 'change', this.render);
-    }
-});
--- a/frontend/js/app/nginx/ssl-passthrough/list/main.ejs
+++ b/frontend/js/app/nginx/ssl-passthrough/list/main.ejs
@ -1,12 +0,0 @@
-<thead>
-    <th width="30">&nbsp;</th>
-    <th><%- i18n('all-hosts', 'domain-name') %></th>
-    <th><%- i18n('str', 'destination') %></th>
-    <th><%- i18n('str', 'status') %></th>
-    <% if (canManage) { %>
-    <th>&nbsp;</th>
-    <% } %>
-</thead>
-<tbody>
-    <!-- items -->
-</tbody>
--- a/frontend/js/app/nginx/ssl-passthrough/list/main.js
+++ b/frontend/js/app/nginx/ssl-passthrough/list/main.js
@ -1,32 +0,0 @@
-const Mn       = require('backbone.marionette');
-const App      = require('../../../main');
-const ItemView = require('./item');
-const template = require('./main.ejs');
-
-const TableBody = Mn.CollectionView.extend({
-    tagName:   'tbody',
-    childView: ItemView
-});
-
-module.exports = Mn.View.extend({
-    tagName:   'table',
-    className: 'table table-hover table-outline table-vcenter card-table',
-    template:  template,
-
-    regions: {
-        body: {
-            el:             'tbody',
-            replaceElement: true
-        }
-    },
-
-    templateContext: {
-        canManage: App.Cache.User.canManage('ssl_passthrough_hosts')
-    },
-
-    onRender: function () {
-        this.showChildView('body', new TableBody({
-            collection: this.collection
-        }));
-    }
-});
--- a/frontend/js/app/nginx/ssl-passthrough/main.ejs
+++ b/frontend/js/app/nginx/ssl-passthrough/main.ejs
@ -1,23 +0,0 @@
-<div class="card">
-    <div class="card-status bg-dark"></div>
-    <div class="card-header">
-        <h3 class="card-title"><%- i18n('ssl-passthrough-hosts', 'title') %></h3>
-        <div class="card-options">
-            <a href="#" class="btn btn-outline-secondary btn-sm ml-2 help"><i class="fe fe-help-circle"></i></a>
-            <% if (showAddButton) { %>
-            <a href="#" class="btn btn-outline-dark btn-sm ml-2 add-item"><%- i18n('ssl-passthrough-hosts', 'add') %></a>
-            <% } %>
-        </div>
-    </div>
-    <div class="card-body no-padding min-100">
-        <div id="ssl-passthrough-disabled-info" class="alert alert-danger rounded-0 mb-0">
-            <%= i18n('ssl-passthrough-hosts', 'is-disabled-warning', {url: 'https://nginxproxymanager.com/advanced-config/#ssl-passthrough'}) %>
-        </div>
-        <div class="dimmer active">
-            <div class="loader"></div>
-            <div class="dimmer-content list-region">
-                <!-- List Region -->
-            </div>
-        </div>
-    </div>
-</div>
--- a/frontend/js/app/nginx/ssl-passthrough/main.js
+++ b/frontend/js/app/nginx/ssl-passthrough/main.js
@ -1,91 +0,0 @@
-const Mn                  = require('backbone.marionette');
-const App                 = require('../../main');
-const SslPassthroughModel = require('../../../models/ssl-passthrough-host');
-const ListView            = require('./list/main');
-const ErrorView           = require('../../error/main');
-const EmptyView           = require('../../empty/main');
-const template            = require('./main.ejs');
-
-module.exports = Mn.View.extend({
-    id:       'nginx-ssl-passthrough',
-    template: template,
-
-    ui: {
-        list_region:   '.list-region',
-        add:           '.add-item',
-        help:          '.help',
-        dimmer:        '.dimmer',
-        disabled_info: '#ssl-passthrough-disabled-info'
-    },
-
-    regions: {
-        list_region: '@ui.list_region'
-    },
-
-    events: {
-        'click @ui.add': function (e) {
-            e.preventDefault();
-            App.Controller.showNginxSslPassthroughForm();
-        },
-
-        'click @ui.help': function (e) {
-            e.preventDefault();
-            App.Controller.showHelp(App.i18n('ssl-passthrough-hosts', 'help-title'), App.i18n('ssl-passthrough-hosts', 'help-content'));
-        }
-    },
-
-    templateContext: {
-        showAddButton: App.Cache.User.canManage('ssl_passthrough_hosts')
-    },
-
-    onRender: function () {
-        let view = this;
-        view.ui.disabled_info.hide();
-
-        App.Api.Nginx.SslPassthroughHosts.getFeatureEnabled().then((response) => {
-            if (response.ssl_passthrough_enabled === false) {
-                view.ui.disabled_info.show();
-            } else {
-                view.ui.disabled_info.hide();
-            }
-        });
-
-        App.Api.Nginx.SslPassthroughHosts.getAll(['owner'])
-            .then(response => {
-                if (!view.isDestroyed()) {
-                    if (response && response.length) {
-                        view.showChildView('list_region', new ListView({
-                            collection: new SslPassthroughModel.Collection(response)
-                        }));
-                    } else {
-                        let manage = App.Cache.User.canManage('ssl_passthrough_hosts');
-
-                        view.showChildView('list_region', new EmptyView({
-                            title:      App.i18n('ssl-passthrough-hosts', 'empty'),
-                            subtitle:   App.i18n('all-hosts', 'empty-subtitle', {manage: manage}),
-                            link:       manage ? App.i18n('ssl-passthrough-hosts', 'add') : null,
-                            btn_color:  'dark',
-                            permission: 'ssl-passthrough-hosts',
-                            action:     function () {
-                                App.Controller.showNginxSslPassthroughForm();
-                            }
-                        }));
-                    }
-                }
-            })
-            .catch(err => {
-                view.showChildView('list_region', new ErrorView({
-                    code:    err.code,
-                    message: err.message,
-                    retry:   function () {
-                        App.Controller.showNginxSslPassthrough();
-                    }
-                }));
-
-                console.error(err);
-            })
-            .then(() => {
-                view.ui.dimmer.removeClass('active');
-            });
-    }
-});
--- a/frontend/js/app/router.js
+++ b/frontend/js/app/router.js
@ -4,17 +4,16 @@ const Controller = require('./controller');
 module.exports = AppRouter.default.extend({
    controller: Controller,
    appRoutes:  {
-        users:                   'showUsers',
-        logout:                  'logout',
-        'nginx/proxy':           'showNginxProxy',
-        'nginx/redirection':     'showNginxRedirection',
-        'nginx/404':             'showNginxDead',
-        'nginx/ssl-passthrough': 'showNginxSslPassthrough',
-        'nginx/stream':          'showNginxStream',
-        'nginx/access':          'showNginxAccess',
-        'nginx/certificates':    'showNginxCertificates',
-        'audit-log':             'showAuditLog',
-        'settings':              'showSettings',
-        '*default':              'showDashboard'
+        users:                'showUsers',
+        logout:               'logout',
+        'nginx/proxy':        'showNginxProxy',
+        'nginx/redirection':  'showNginxRedirection',
+        'nginx/404':          'showNginxDead',
+        'nginx/stream':       'showNginxStream',
+        'nginx/access':       'showNginxAccess',
+        'nginx/certificates': 'showNginxCertificates',
+        'audit-log':          'showAuditLog',
+        'settings':           'showSettings',
+        '*default':           'showDashboard'
    }
 });
--- a/frontend/js/app/ui/menu/main.ejs
+++ b/frontend/js/app/ui/menu/main.ejs
@ -20,10 +20,6 @@
                        <a href="/nginx/stream" class="dropdown-item "><%- i18n('streams', 'title') %></a>
                        <% } %>

-                        <% if (canShow('ssl_passthrough_hosts')) { %>
-                        <a href="/nginx/ssl-passthrough" class="dropdown-item "><%- i18n('ssl-passthrough-hosts', 'title') %></a>
-                        <% } %>
-
                        <% if (canShow('dead_hosts')) { %>
                        <a href="/nginx/404" class="dropdown-item "><%- i18n('dead-hosts', 'title') %></a>
                        <% } %>
--- a/frontend/js/app/user/permissions.ejs
+++ b/frontend/js/app/user/permissions.ejs
@ -31,9 +31,9 @@
                </div>

                <%
-                var list = ['proxy-hosts', 'redirection-hosts', 'dead-hosts', 'streams', 'ssl-passthrough-hosts', 'access-lists', 'certificates'];
+                var list = ['proxy-hosts', 'redirection-hosts', 'dead-hosts', 'streams', 'access-lists', 'certificates'];
                list.map(function(item) {
-                    var perm = item.replace(/-/g, '_');
+                    var perm = item.replace('-', '_');
                    %>
                    <div class="col-sm-12 col-md-12">
                        <div class="form-group">
--- a/frontend/js/app/user/permissions.js
+++ b/frontend/js/app/user/permissions.js
@ -29,13 +29,12 @@ module.exports = Mn.View.extend({
            if (view.model.isAdmin()) {
                // Force some attributes for admin
                data = _.assign({}, data, {
-                    access_lists:          'manage',
-                    dead_hosts:            'manage',
-                    proxy_hosts:           'manage',
-                    redirection_hosts:     'manage',
-                    ssl_passthrough_hosts: 'manage',
-                    streams:               'manage',
-                    certificates:          'manage'
+                    access_lists:      'manage',
+                    dead_hosts:        'manage',
+                    proxy_hosts:       'manage',
+                    redirection_hosts: 'manage',
+                    streams:           'manage',
+                    certificates:      'manage'
                });
            }

--- a/frontend/js/i18n/messages.json
+++ b/frontend/js/i18n/messages.json
@ -72,7 +72,6 @@
      "enable-ssl": "Enable SSL",
      "force-ssl": "Force SSL",
      "http2-support": "HTTP/2 Support",
-      "domain-name": "Domain Name",
      "domain-names": "Domain Names",
      "cert-provider": "Certificate Provider",
      "block-exploits": "Block Common Exploits",
@ -85,6 +84,8 @@
      "advanced": "Advanced",
      "advanced-warning": "Enter your custom Nginx configuration here at your own risk!",
      "advanced-config": "Custom Nginx Configuration",
+      "advanced-config-var-headline": "These proxy details are available as nginx variables:",
+      "advanced-config-header-info": "Please note, that any add_header or set_header directives added here will not be used by nginx. You will have to add a custom location '/' and add the header in the custom config there.",
      "hsts-enabled": "HSTS Enabled",
      "hsts-subdomains": "HSTS Subdomains",
      "locations": "Custom locations"
@ -116,19 +117,6 @@
      "processing-info": "Processing... This might take a few minutes.",
      "passphrase-protection-support-info": "Key files protected with a passphrase are not supported."
    },
-    "ssl-passthrough-hosts": {
-      "title": "SSL Passthrough Hosts",
-      "empty": "There are no SSL Passthrough Hosts",
-      "add": "Add SSL Passthrough Hosts",
-      "form-title": "{id, select, undefined{New} other{Edit}} SSL Passthrough Host",
-      "forwarding-host": "Forward Host",
-      "forwarding-port": "Forward Port",
-      "delete": "Delete SSL Passthrough Host",
-      "delete-confirm": "Are you sure you want to delete this SSL Passthrough Host?",
-      "is-disabled-warning": "SSL Passthrough Hosts are not enabled in the environment. Please see <a href=\"{url}\" target=\"_blank\">the docs</a> for more information.",
-      "help-title": "What is an SSL Passthrough Host?",
-      "help-content": "An SSL Passthrough Host will allow you to proxy a server without SSL termination. This means the SSL encryption of the server will be passed right through the proxy, retaining the upstream certificate.\n Because of the SSL encryption the proxy does not know anything about the traffic, and it just relies on an SSL feature called Server Name Indication to know where to send this packet. This also means if the client does not provide this additional information, accessing the site through the proxy won't be possible. But most modern browsers include this information in HTTP requests.\n\nDue to nginx constraints using SSL Passthrough comes with a performance penalty for other hosts, since all hosts (including normal proxy hosts) now have to pass through this additional step and basically being proxied twice. If you want to retain the upstream SSL certificate but do not need your service to be available on port 443, it is recommended to use a stream host instead."
-    },
    "proxy-hosts": {
      "title": "Proxy Hosts",
      "empty": "There are no Proxy Hosts",
@ -155,7 +143,7 @@
      "forward-http-status-code": "HTTP Code",
      "forward-domain": "Forward Domain",
      "preserve-path": "Preserve Path",
-      "delete": "Delete Proxy Host",
+      "delete": "Delete Redirection Host",
      "delete-confirm": "Are you sure you want to delete the Redirection host for: <strong>{domains}</strong>?",
      "help-title": "What is a Redirection Host?",
      "help-content": "A Redirection Host will redirect requests from the incoming domain and push the viewer to another domain.\nThe most common reason to use this type of host is when your website changes domains but you still have search engine or referrer links pointing to the old domain."
@ -202,6 +190,16 @@
      "other-certificate-key": "Certificate Key",
      "other-intermediate-certificate": "Intermediate Certificate",
      "force-renew": "Renew Now",
+      "test-reachability": "Test Server Reachability",
+      "reachability-title": "Test Server Reachability",
+      "reachability-info": "Test whether the domains are reachable from the public internet using Site24x7. This is not necessary when using the DNS Challenge.",
+      "reachability-failed-to-reach-api": "Communication with the API failed, is NPM running correctly?",
+      "reachability-failed-to-check": "Failed to check the reachability due to a communication error with site24x7.com.",
+      "reachability-ok": "Your server is reachable and creating certificates should be possible.",
+      "reachability-404": "There is a server found at this domain but it does not seem to be Nginx Proxy Manager. Please make sure your domain points to the IP where your NPM instance is running.",
+      "reachability-not-resolved": "There is no server available at this domain. Please make sure your domain exists and points to the IP where your NPM instance is running and if necessary port 80 is forwarded in your router.",
+      "reachability-wrong-data": "There is a server found at this domain but it returned an unexpected data. Is it the NPM server? Please make sure your domain points to the IP where your NPM instance is running.",
+      "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'sEncrypt Certificate"
    },
@ -262,7 +260,6 @@
      "proxy-host": "Proxy Host",
      "redirection-host": "Redirection Host",
      "dead-host": "404 Host",
-      "ssl-passthrough-host": "SSL Passthrough Host",
      "stream": "Stream",
      "user": "User",
      "certificate": "Certificate",
--- a/frontend/js/models/ssl-passthrough-host.js
+++ b/frontend/js/models/ssl-passthrough-host.js
@ -1,27 +0,0 @@
-const Backbone = require('backbone');
-
-const model = Backbone.Model.extend({
-    idAttribute: 'id',
-
-    defaults: function () {
-        return {
-            id:              undefined,
-            created_on:      null,
-            modified_on:     null,
-            domain_name:     null,
-            forwarding_host: null,
-            forwarding_port: null,
-            enabled:         true,
-            meta:            {},
-            // The following are expansions:
-            owner:           null
-        };
-    }
-});
-
-module.exports = {
-    Model:      model,
-    Collection: Backbone.Collection.extend({
-        model: model
-    })
-};
--- a/frontend/package.json
+++ b/frontend/package.json
@ -7,7 +7,6 @@
    "@babel/core": "^7.9.0",
    "babel-core": "^6.26.3",
    "babel-loader": "^8.1.0",
-    "babel-minify-webpack-plugin": "^0.3.1",
    "babel-preset-env": "^1.7.0",
    "backbone": "^1.4.0",
    "backbone.marionette": "^4.1.2",
--- a/frontend/scss/custom.scss
+++ b/frontend/scss/custom.scss
@ -12,15 +12,6 @@ a:hover {
    color: darken($primary-color, 10%);
 }

-.alert-danger a {
-    color: #6b1110;
-    text-decoration: underline;
-}
-
-a:hover {
-    color: darken(#6b1110, 10%);
-}
-
 .dropdown-header {
    padding-left: 1rem;
 }
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@ -13,8 +13,8 @@ module.exports = {
 	},
 	output:    {
 		path:          path.resolve(__dirname, 'dist'),
-		filename:      'js/[name].bundle.js',
-		chunkFilename: 'js/[name].bundle.[id].js',
+		filename:      `js/[name].bundle.js?v=${PACKAGE.version}`,
+		chunkFilename: `js/[name].bundle.[id].js?v=${PACKAGE.version}`,
 		publicPath:    '/'
 	},
 	resolve:   {
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@ -823,11 +823,6 @@ babel-helper-define-map@^6.24.1:
    babel-types "^6.26.0"
    lodash "^4.17.4"

-babel-helper-evaluate-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.3.0.tgz#2439545e0b6eae5b7f49b790acbebd6b9a73df20"
-  integrity sha512-dRFlMTqUJRGzx5a2smKxmptDdNCXKSkPcXWzKLwAV72hvIZumrd/0z9RcewHkr7PmAEq+ETtpD1GK6wZ6ZUXzw==
-
 babel-helper-explode-assignable-expression@^6.24.1:
  version "6.24.1"
  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
@ -837,11 +832,6 @@ babel-helper-explode-assignable-expression@^6.24.1:
    babel-traverse "^6.24.1"
    babel-types "^6.24.1"

-babel-helper-flip-expressions@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.3.0.tgz#f5b6394bd5219b43cf8f7b201535ed540c6e7fa2"
-  integrity sha512-kNGohWmtAG3b7tN1xocRQ5rsKkH/hpvZsMiGOJ1VwGJKhnwzR5KlB3rvKBaBPl5/IGHcopB2JN+r1SUEX1iMAw==
-
 babel-helper-function-name@^6.24.1:
  version "6.24.1"
  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
@ -869,21 +859,6 @@ babel-helper-hoist-variables@^6.24.1:
    babel-runtime "^6.22.0"
    babel-types "^6.24.1"

-babel-helper-is-nodes-equiv@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
-  integrity sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=
-
-babel-helper-is-void-0@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.3.0.tgz#95570d20bd27b2206f68083ae9980ee7003d8fe7"
-  integrity sha512-JVqdX8y7Rf/x4NwbqtUI7mdQjL9HWoDnoAEQ8Gv8oxzjvbJv+n75f7l36m9Y8C7sCUltX3V5edndrp7Hp1oSXQ==
-
-babel-helper-mark-eval-scopes@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.3.0.tgz#b4731314fdd7a89091271a5213b4e12d236e29e8"
-  integrity sha512-nrho5Dg4vl0VUgURVpGpEGiwbst5JX7efIyDHFxmkCx/ocQFnrPt8ze9Kxl6TKjR29bJ7D/XKY1NMlSxOQJRbQ==
-
 babel-helper-optimise-call-expression@^6.24.1:
  version "6.24.1"
  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
@ -912,11 +887,6 @@ babel-helper-remap-async-to-generator@^6.24.1:
    babel-traverse "^6.24.1"
    babel-types "^6.24.1"

-babel-helper-remove-or-void@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.3.0.tgz#f43c86147c8fcc395a9528cbb31e7ff49d7e16e3"
-  integrity sha512-D68W1M3ibCcbg0ysh3ww4/O0g10X1CXK720oOuR8kpfY7w0yP4tVcpK7zDmI1JecynycTQYAZ1rhLJo9aVtIKQ==
-
 babel-helper-replace-supers@^6.24.1:
  version "6.24.1"
  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
@ -929,11 +899,6 @@ babel-helper-replace-supers@^6.24.1:
    babel-traverse "^6.24.1"
    babel-types "^6.24.1"

-babel-helper-to-multiple-sequence-expressions@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.3.0.tgz#8da2275ccc26995566118f7213abfd9af7214427"
-  integrity sha512-1uCrBD+EAaMnAYh7hc944n8Ga19y3daEnoXWPYDvFVsxMCc1l8aDjksApaCEaNSSuewq8BEcff47Cy1PbLg2Gw==
-
 babel-helpers@^6.24.1:
  version "6.24.1"
  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
@ -960,15 +925,6 @@ babel-messages@^6.23.0:
  dependencies:
    babel-runtime "^6.22.0"

-babel-minify-webpack-plugin@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-minify-webpack-plugin/-/babel-minify-webpack-plugin-0.3.1.tgz#292aa240af190e2dcadf4f684d6d84d179b6d5a4"
-  integrity sha512-Johg6Ju0Gxevk2R55eutMqnyXwlyUzCtwunBpiyNzoxGnKum+x5nfNuYZYHGd5Bmc1gmhjwzb7GkxHWOtYWmtQ==
-  dependencies:
-    babel-core "^6.26.0"
-    babel-preset-minify "^0.3.0"
-    webpack-sources "^1.0.1"
-
 babel-plugin-check-es2015-constants@^6.22.0:
  version "6.22.0"
  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
@ -976,82 +932,6 @@ babel-plugin-check-es2015-constants@^6.22.0:
  dependencies:
    babel-runtime "^6.22.0"

-babel-plugin-minify-builtins@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.3.0.tgz#4740117a6a784063aaf8f092989cf9e4bd484860"
-  integrity sha512-MqhSHlxkmgURqj3144qPksbZ/qof1JWdumcbucc4tysFcf3P3V3z3munTevQgKEFNMd8F5/ECGnwb63xogLjAg==
-  dependencies:
-    babel-helper-evaluate-path "^0.3.0"
-
-babel-plugin-minify-constant-folding@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.3.0.tgz#687e40336bd4ddd921e0e197f0006235ac184bb9"
-  integrity sha512-1XeRpx+aY1BuNY6QU/cm6P+FtEi3ar3XceYbmC+4q4W+2Ewq5pL7V68oHg1hKXkBIE0Z4/FjSoHz6vosZLOe/A==
-  dependencies:
-    babel-helper-evaluate-path "^0.3.0"
-
-babel-plugin-minify-dead-code-elimination@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.3.0.tgz#a323f686c404b824186ba5583cf7996cac81719e"
-  integrity sha512-SjM2Fzg85YZz+q/PNJ/HU4O3W98FKFOiP9K5z3sfonlamGOzvZw3Eup2OTiEBsbbqTeY8yzNCAv3qpJRYCgGmw==
-  dependencies:
-    babel-helper-evaluate-path "^0.3.0"
-    babel-helper-mark-eval-scopes "^0.3.0"
-    babel-helper-remove-or-void "^0.3.0"
-    lodash.some "^4.6.0"
-
-babel-plugin-minify-flip-comparisons@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.3.0.tgz#6627893a409c9f30ef7f2c89e0c6eea7ee97ddc4"
-  integrity sha512-B8lK+ekcpSNVH7PZpWDe5nC5zxjRiiT4nTsa6h3QkF3Kk6y9qooIFLemdGlqBq6j0zALEnebvCpw8v7gAdpgnw==
-  dependencies:
-    babel-helper-is-void-0 "^0.3.0"
-
-babel-plugin-minify-guarded-expressions@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.3.0.tgz#2552d96189ef45d9a463f1a6b5e4fa110703ac8d"
-  integrity sha512-O+6CvF5/Ttsth3LMg4/BhyvVZ82GImeKMXGdVRQGK/8jFiP15EjRpdgFlxv3cnqRjqdYxLCS6r28VfLpb9C/kA==
-  dependencies:
-    babel-helper-flip-expressions "^0.3.0"
-
-babel-plugin-minify-infinity@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.3.0.tgz#c5ec0edd433517cf31b3af17077c202beb48bbe7"
-  integrity sha512-Sj8ia3/w9158DWieUxU6/VvnYVy59geeFEkVgLZYBE8EBP+sN48tHtBM/jSgz0ejEdBlcfqJ6TnvPmVXTzR2BQ==
-
-babel-plugin-minify-mangle-names@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.3.0.tgz#f28561bad0dd2f0380816816bb946e219b3b6135"
-  integrity sha512-PYTonhFWURsfAN8achDwvR5Xgy6EeTClLz+fSgGRqjAIXb0OyFm3/xfccbQviVi1qDXmlSnt6oJhBg8KE4Fn7Q==
-  dependencies:
-    babel-helper-mark-eval-scopes "^0.3.0"
-
-babel-plugin-minify-numeric-literals@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.3.0.tgz#b57734a612e8a592005407323c321119f27d4b40"
-  integrity sha512-TgZj6ay8zDw74AS3yiIfoQ8vRSNJisYO/Du60S8nPV7EW7JM6fDMx5Sar6yVHlVuuwNgvDUBh191K33bVrAhpg==
-
-babel-plugin-minify-replace@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.3.0.tgz#980125bbf7cbb5a637439de9d0b1b030a4693893"
-  integrity sha512-VR6tTg2Lt0TicHIOw04fsUtpPw7RaRP8PC8YzSFwEixnzvguZjZJoL7TgG7ZyEWQD1cJ96UezswECmFNa815bg==
-
-babel-plugin-minify-simplify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.3.0.tgz#14574cc74d21c81d3060fafa041010028189f11b"
-  integrity sha512-2M16ytQOCqBi7bYMu4DCWn8e6KyFCA108F6+tVrBJxOmm5u2sOmTFEa8s94tR9RHRRNYmcUf+rgidfnzL3ik9Q==
-  dependencies:
-    babel-helper-flip-expressions "^0.3.0"
-    babel-helper-is-nodes-equiv "^0.0.1"
-    babel-helper-to-multiple-sequence-expressions "^0.3.0"
-
-babel-plugin-minify-type-constructors@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.3.0.tgz#7f5a86ef322c4746364e3c591b8514eeafea6ad4"
-  integrity sha512-XRXpvsUCPeVw9YEUw+9vSiugcSZfow81oIJT0yR9s8H4W7yJ6FHbImi5DJHoL8KcDUjYnL9wYASXk/fOkbyR6Q==
-  dependencies:
-    babel-helper-is-void-0 "^0.3.0"
-
 babel-plugin-syntax-async-functions@^6.8.0:
  version "6.13.0"
  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@ -1275,33 +1155,6 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
    babel-plugin-syntax-exponentiation-operator "^6.8.0"
    babel-runtime "^6.22.0"

-babel-plugin-transform-inline-consecutive-adds@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.3.0.tgz#f07d93689c0002ed2b2b62969bdd99f734e03f57"
-  integrity sha512-iZsYAIjYLLfLK0yN5WVT7Xf7Y3wQ9Z75j9A8q/0IglQSpUt2ppTdHlwl/GeaXnxdaSmsxBu861klbTBbv2n+RA==
-
-babel-plugin-transform-member-expression-literals@^6.9.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz#37039c9a0c3313a39495faac2ff3a6b5b9d038bf"
-  integrity sha1-NwOcmgwzE6OUlfqsL/OmtbnQOL8=
-
-babel-plugin-transform-merge-sibling-variables@^6.9.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz#85b422fc3377b449c9d1cde44087203532401dae"
-  integrity sha1-hbQi/DN3tEnJ0c3kQIcgNTJAHa4=
-
-babel-plugin-transform-minify-booleans@^6.9.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz#acbb3e56a3555dd23928e4b582d285162dd2b198"
-  integrity sha1-rLs+VqNVXdI5KOS1gtKFFi3SsZg=
-
-babel-plugin-transform-property-literals@^6.9.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz#98c1d21e255736573f93ece54459f6ce24985d39"
-  integrity sha1-mMHSHiVXNlc/k+zlRFn2ziSYXTk=
-  dependencies:
-    esutils "^2.0.2"
-
 babel-plugin-transform-regenerator@^6.22.0:
  version "6.26.0"
  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
@ -1309,33 +1162,6 @@ babel-plugin-transform-regenerator@^6.22.0:
  dependencies:
    regenerator-transform "^0.10.0"

-babel-plugin-transform-regexp-constructors@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.3.0.tgz#9bb2c8dd082271a5cb1b3a441a7c52e8fd07e0f5"
-  integrity sha512-h92YHzyl042rb0naKO8frTHntpRFwRgKkfWD8602kFHoQingjJNtbvZzvxqHncJ6XmKVyYvfrBpDOSkCTDIIxw==
-
-babel-plugin-transform-remove-console@^6.9.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
-  integrity sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=
-
-babel-plugin-transform-remove-debugger@^6.9.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz#42b727631c97978e1eb2d199a7aec84a18339ef2"
-  integrity sha1-QrcnYxyXl44estGZp67IShgznvI=
-
-babel-plugin-transform-remove-undefined@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.3.0.tgz#03f5f0071867781e9beabbc7b77bf8095fd3f3ec"
-  integrity sha512-TYGQucc8iP3LJwN3kDZLEz5aa/2KuFrqpT+s8f8NnHsBU1sAgR3y8Opns0xhC+smyDYWscqFCKM1gbkWQOhhnw==
-  dependencies:
-    babel-helper-evaluate-path "^0.3.0"
-
-babel-plugin-transform-simplify-comparison-operators@^6.9.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
-  integrity sha1-9ir+CWyrDh9ootdT/fKDiIRxzrk=
-
 babel-plugin-transform-strict-mode@^6.24.1:
  version "6.24.1"
  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
@ -1344,11 +1170,6 @@ babel-plugin-transform-strict-mode@^6.24.1:
    babel-runtime "^6.22.0"
    babel-types "^6.24.1"

-babel-plugin-transform-undefined-to-void@^6.9.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
-  integrity sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=
-
 babel-preset-env@^1.7.0:
  version "1.7.0"
  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
@ -1385,35 +1206,6 @@ babel-preset-env@^1.7.0:
    invariant "^2.2.2"
    semver "^5.3.0"

-babel-preset-minify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.3.0.tgz#7db64afa75f16f6e06c0aa5f25195f6f36784d77"
-  integrity sha512-+VV2GWEyak3eDOmzT1DDMuqHrw3VbE9nBNkx2LLVs4pH/Me32ND8DRpVDd8IRvk1xX5p75nygyRPtkMh6GIAbQ==
-  dependencies:
-    babel-plugin-minify-builtins "^0.3.0"
-    babel-plugin-minify-constant-folding "^0.3.0"
-    babel-plugin-minify-dead-code-elimination "^0.3.0"
-    babel-plugin-minify-flip-comparisons "^0.3.0"
-    babel-plugin-minify-guarded-expressions "^0.3.0"
-    babel-plugin-minify-infinity "^0.3.0"
-    babel-plugin-minify-mangle-names "^0.3.0"
-    babel-plugin-minify-numeric-literals "^0.3.0"
-    babel-plugin-minify-replace "^0.3.0"
-    babel-plugin-minify-simplify "^0.3.0"
-    babel-plugin-minify-type-constructors "^0.3.0"
-    babel-plugin-transform-inline-consecutive-adds "^0.3.0"
-    babel-plugin-transform-member-expression-literals "^6.9.0"
-    babel-plugin-transform-merge-sibling-variables "^6.9.0"
-    babel-plugin-transform-minify-booleans "^6.9.0"
-    babel-plugin-transform-property-literals "^6.9.0"
-    babel-plugin-transform-regexp-constructors "^0.3.0"
-    babel-plugin-transform-remove-console "^6.9.0"
-    babel-plugin-transform-remove-debugger "^6.9.0"
-    babel-plugin-transform-remove-undefined "^0.3.0"
-    babel-plugin-transform-simplify-comparison-operators "^6.9.0"
-    babel-plugin-transform-undefined-to-void "^6.9.0"
-    lodash.isplainobject "^4.0.6"
-
 babel-register@^6.26.0:
  version "6.26.0"
  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
@ -4289,16 +4081,6 @@ locate-path@^5.0.0:
  dependencies:
    p-locate "^4.1.0"

-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
-
-lodash.some@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-  integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
-
 lodash@^4.0.0, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@~4.17.10:
  version "4.17.21"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@ -6869,7 +6651,7 @@ webpack-log@^2.0.0:
    ansi-colors "^3.0.0"
    uuid "^3.3.2"

-webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
+webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
  version "1.4.3"
  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
--- a/global/certbot-dns-plugins.js
+++ b/global/certbot-dns-plugins.js
@ -12,7 +12,7 @@
 *      version_requirement: "Optional package version requirements (e.g. ==1.3 or >=1.2,<2.0, see https://www.python.org/dev/peps/pep-0440/#version-specifiers)",
 *      dependencies: "Additional dependencies, space separated (as you would pass it to pip install)",
 *      credentials: `Template of the credentials file`,
- *      full_plugin_name: "The full plugin name as used in the commandline with certbot, including prefixes, e.g. 'certbot-dns-njalla:dns-njalla'",
+ *      full_plugin_name: "The full plugin name as used in the commandline with certbot, e.g. 'dns-njalla'",
 *    },
 *    ...
 *  }
@ -26,18 +26,18 @@ module.exports = {
 		package_name:        'certbot-dns-acmedns',
 		version_requirement: '~=0.1.0',
 		dependencies:        '',
-		credentials:         `certbot_dns_acmedns:dns_acmedns_api_url = http://acmedns-server/
-certbot_dns_acmedns:dns_acmedns_registration_file = /data/acme-registration.json`,
-		full_plugin_name: 'certbot-dns-acmedns:dns-acmedns',
+		credentials:         `dns_acmedns_api_url = http://acmedns-server/
+dns_acmedns_registration_file = /data/acme-registration.json`,
+		full_plugin_name: 'dns-acmedns',
 	},
 	aliyun: {
 		display_name:        'Aliyun',
 		package_name:        'certbot-dns-aliyun',
 		version_requirement: '~=0.38.1',
 		dependencies:        '',
-		credentials:         `certbot_dns_aliyun:dns_aliyun_access_key = 12345678
-certbot_dns_aliyun:dns_aliyun_access_key_secret = 1234567890abcdef1234567890abcdef`,
-		full_plugin_name: 'certbot-dns-aliyun:dns-aliyun',
+		credentials:         `dns_aliyun_access_key = 12345678
+dns_aliyun_access_key_secret = 1234567890abcdef1234567890abcdef`,
+		full_plugin_name: 'dns-aliyun',
 	},
 	//####################################################//
 	azure: {
@ -67,11 +67,11 @@ dns_azure_zone2 = example.org:/subscriptions/99800903-fb14-4992-9aff-12eaf274462
 	},
 	//####################################################//
 	cloudflare: {
-		display_name: 'Cloudflare',
-		package_name: 'certbot-dns-cloudflare',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies: 'cloudflare',
-		credentials:  `# Cloudflare API token
+		display_name:        'Cloudflare',
+		package_name:        'certbot-dns-cloudflare',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        'cloudflare',
+		credentials:         `# Cloudflare API token
 dns_cloudflare_api_token = 0123456789abcdef0123456789abcdef01234567`,
 		full_plugin_name: 'dns-cloudflare',
 	},
@ -93,11 +93,11 @@ dns_cloudflare_api_token = 0123456789abcdef0123456789abcdef01234567`,
 	},
 	//####################################################//
 	cloudxns: {
-		display_name: 'CloudXNS',
-		package_name: 'certbot-dns-cloudxns',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies: '',
-		credentials:  `dns_cloudxns_api_key = 1234567890abcdef1234567890abcdef
+		display_name:        'CloudXNS',
+		package_name:        'certbot-dns-cloudxns',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         `dns_cloudxns_api_key = 1234567890abcdef1234567890abcdef
 dns_cloudxns_secret_key = 1122334455667788`,
 		full_plugin_name: 'dns-cloudxns',
 	},
@ -107,9 +107,9 @@ dns_cloudxns_secret_key = 1122334455667788`,
 		package_name:        'certbot-dns-corenetworks',
 		version_requirement: '~=0.1.4',
 		dependencies:        '',
-		credentials:         `certbot_dns_corenetworks:dns_corenetworks_username = asaHB12r
-certbot_dns_corenetworks:dns_corenetworks_password = secure_password`,
-		full_plugin_name: 'certbot-dns-corenetworks:dns-corenetworks',
+		credentials:         `dns_corenetworks_username = asaHB12r
+dns_corenetworks_password = secure_password`,
+		full_plugin_name: 'dns-corenetworks',
 	},
 	//####################################################//
 	cpanel: {
@ -117,10 +117,10 @@ certbot_dns_corenetworks:dns_corenetworks_password = secure_password`,
 		package_name:        'certbot-dns-cpanel',
 		version_requirement: '~=0.2.2',
 		dependencies:        '',
-		credentials:         `certbot_dns_cpanel:cpanel_url = https://cpanel.example.com:2083
-certbot_dns_cpanel:cpanel_username = user
-certbot_dns_cpanel:cpanel_password = hunter2`,
-		full_plugin_name: 'certbot-dns-cpanel:cpanel',
+		credentials:         `cpanel_url = https://cpanel.example.com:2083
+cpanel_username = user
+cpanel_password = hunter2`,
+		full_plugin_name: 'cpanel',
 	},
 	//####################################################//
 	desec: {
@ -128,9 +128,9 @@ certbot_dns_cpanel:cpanel_password = hunter2`,
 		package_name:        'certbot-dns-desec',
 		version_requirement: '~=0.3.0',
 		dependencies:        '',
-		credentials:         `certbot_dns_desec:dns_desec_token = YOUR_DESEC_API_TOKEN
-certbot_dns_desec:dns_desec_endpoint = https://desec.io/api/v1/`,
-		full_plugin_name: 'certbot-dns-desec:dns-desec',
+		credentials:         `dns_desec_token = YOUR_DESEC_API_TOKEN
+dns_desec_endpoint = https://desec.io/api/v1/`,
+		full_plugin_name: 'dns-desec',
 	},
 	//####################################################//
 	duckdns: {
@ -143,12 +143,12 @@ certbot_dns_desec:dns_desec_endpoint = https://desec.io/api/v1/`,
 	},
 	//####################################################//
 	digitalocean: {
-		display_name:     'DigitalOcean',
-		package_name:     'certbot-dns-digitalocean',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies:     '',
-		credentials:      'dns_digitalocean_token = 0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff',
-		full_plugin_name: 'dns-digitalocean',
+		display_name:        'DigitalOcean',
+		package_name:        'certbot-dns-digitalocean',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         'dns_digitalocean_token = 0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff',
+		full_plugin_name:    'dns-digitalocean',
 	},
 	//####################################################//
 	directadmin: {
@ -163,20 +163,20 @@ directadmin_password = aSuperStrongPassword`,
 	},
 	//####################################################//
 	dnsimple: {
-		display_name:     'DNSimple',
-		package_name:     'certbot-dns-dnsimple',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies:     '',
-		credentials:      'dns_dnsimple_token = MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw',
-		full_plugin_name: 'dns-dnsimple',
+		display_name:        'DNSimple',
+		package_name:        'certbot-dns-dnsimple',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         'dns_dnsimple_token = MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw',
+		full_plugin_name:    'dns-dnsimple',
 	},
 	//####################################################//
 	dnsmadeeasy: {
-		display_name: 'DNS Made Easy',
-		package_name: 'certbot-dns-dnsmadeeasy',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies: '',
-		credentials:  `dns_dnsmadeeasy_api_key = 1c1a3c91-4770-4ce7-96f4-54c0eb0e457a
+		display_name:        'DNS Made Easy',
+		package_name:        'certbot-dns-dnsmadeeasy',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         `dns_dnsmadeeasy_api_key = 1c1a3c91-4770-4ce7-96f4-54c0eb0e457a
 dns_dnsmadeeasy_secret_key = c9b5625f-9834-4ff8-baba-4ed5f32cae55`,
 		full_plugin_name: 'dns-dnsmadeeasy',
 	},
@ -186,9 +186,9 @@ dns_dnsmadeeasy_secret_key = c9b5625f-9834-4ff8-baba-4ed5f32cae55`,
 		package_name:        'certbot-dns-dnspod',
 		version_requirement: '~=0.1.0',
 		dependencies:        '',
-		credentials:         `certbot_dns_dnspod:dns_dnspod_email = "DNSPOD-API-REQUIRES-A-VALID-EMAIL"
-certbot_dns_dnspod:dns_dnspod_api_token = "DNSPOD-API-TOKEN"`,
-		full_plugin_name: 'certbot-dns-dnspod:dns-dnspod',
+		credentials:         `dns_dnspod_email = "DNSPOD-API-REQUIRES-A-VALID-EMAIL"
+dns_dnspod_api_token = "DNSPOD-API-TOKEN"`,
+		full_plugin_name: 'dns-dnspod',
 	},
 	//####################################################//
 	dynu: {
@ -196,8 +196,8 @@ certbot_dns_dnspod:dns_dnspod_api_token = "DNSPOD-API-TOKEN"`,
 		package_name:        'certbot-dns-dynu',
 		version_requirement: '~=0.0.1',
 		dependencies:        '',
-		credentials:         'certbot_dns_dynu:dns_dynu_auth_token = YOUR_DYNU_AUTH_TOKEN',
-		full_plugin_name:    'certbot-dns-dynu:dns-dynu',
+		credentials:         'dns_dynu_auth_token = YOUR_DYNU_AUTH_TOKEN',
+		full_plugin_name:    'dns-dynu',
 	},
 	//####################################################//
 	eurodns: {
@ -208,16 +208,20 @@ certbot_dns_dnspod:dns_dnspod_api_token = "DNSPOD-API-TOKEN"`,
 		credentials:         `dns_eurodns_applicationId = myuser
 dns_eurodns_apiKey = mysecretpassword
 dns_eurodns_endpoint = https://rest-api.eurodns.com/user-api-gateway/proxy`,
-		full_plugin_name: 'certbot-dns-eurodns:dns-eurodns',
+		full_plugin_name: 'dns-eurodns',
 	},
 	//####################################################//
 	gandi: {
 		display_name:        'Gandi Live DNS',
 		package_name:        'certbot_plugin_gandi',
-		version_requirement: '~=1.2.5',
+		version_requirement: '~=1.3.2',
 		dependencies:        '',
-		credentials:         'certbot_plugin_gandi:dns_api_key = APIKEY',
-		full_plugin_name:    'certbot-plugin-gandi:dns',
+		credentials:         `# live dns v5 api key
+dns_gandi_api_key=APIKEY
+
+# optional organization id, remove it if not used
+dns_gandi_sharing_id=SHARINGID`,
+		full_plugin_name: 'dns-gandi',
 	},
 	//####################################################//
 	godaddy: {
@ -231,11 +235,11 @@ dns_godaddy_key = abcdef0123456789abcdef01234567abcdef0123`,
 	},
 	//####################################################//
 	google: {
-		display_name: 'Google',
-		package_name: 'certbot-dns-google',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies: '',
-		credentials:  `{
+		display_name:        'Google',
+		package_name:        'certbot-dns-google',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         `{
 "type": "service_account",
 ...
 }`,
@ -247,8 +251,8 @@ dns_godaddy_key = abcdef0123456789abcdef01234567abcdef0123`,
 		package_name:        'certbot-dns-hetzner',
 		version_requirement: '~=1.0.4',
 		dependencies:        '',
-		credentials:         'certbot_dns_hetzner:dns_hetzner_api_token = 0123456789abcdef0123456789abcdef',
-		full_plugin_name:    'certbot-dns-hetzner:dns-hetzner',
+		credentials:         'dns_hetzner_api_token = 0123456789abcdef0123456789abcdef',
+		full_plugin_name:    'dns-hetzner',
 	},
 	//####################################################//
 	infomaniak: {
@ -256,8 +260,8 @@ dns_godaddy_key = abcdef0123456789abcdef01234567abcdef0123`,
 		package_name:        'certbot-dns-infomaniak',
 		version_requirement: '~=0.1.12',
 		dependencies:        '',
-		credentials:         'certbot_dns_infomaniak:dns_infomaniak_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
-		full_plugin_name:    'certbot-dns-infomaniak:dns-infomaniak',
+		credentials:         'dns_infomaniak_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+		full_plugin_name:    'dns-infomaniak',
 	},
 	//####################################################//
 	inwx: {
@ -265,22 +269,22 @@ dns_godaddy_key = abcdef0123456789abcdef01234567abcdef0123`,
 		package_name:        'certbot-dns-inwx',
 		version_requirement: '~=2.1.2',
 		dependencies:        '',
-		credentials:         `certbot_dns_inwx:dns_inwx_url = https://api.domrobot.com/xmlrpc/
-certbot_dns_inwx:dns_inwx_username = your_username
-certbot_dns_inwx:dns_inwx_password = your_password
-certbot_dns_inwx:dns_inwx_shared_secret = your_shared_secret optional`,
-		full_plugin_name: 'certbot-dns-inwx:dns-inwx',
+		credentials:         `dns_inwx_url = https://api.domrobot.com/xmlrpc/
+dns_inwx_username = your_username
+dns_inwx_password = your_password
+dns_inwx_shared_secret = your_shared_secret optional`,
+		full_plugin_name: 'dns-inwx',
 	},
 	//####################################################//
 	ionos: {
 		display_name:        'IONOS',
 		package_name:        'certbot-dns-ionos',
-		version_requirement: '~=0.0.7',
+		version_requirement: '==2021.9.20.post1',
 		dependencies:        '',
-		credentials:         `certbot_dns_ionos:dns_ionos_prefix = myapikeyprefix
-certbot_dns_ionos:dns_ionos_secret = verysecureapikeysecret
-certbot_dns_ionos:dns_ionos_endpoint = https://api.hosting.ionos.com`,
-		full_plugin_name: 'certbot-dns-ionos:dns-ionos',
+		credentials:         `dns_ionos_prefix = myapikeyprefix
+dns_ionos_secret = verysecureapikeysecret
+dns_ionos_endpoint = https://api.hosting.ionos.com`,
+		full_plugin_name: 'dns-ionos',
 	},
 	//####################################################//
 	ispconfig: {
@ -288,10 +292,10 @@ certbot_dns_ionos:dns_ionos_endpoint = https://api.hosting.ionos.com`,
 		package_name:        'certbot-dns-ispconfig',
 		version_requirement: '~=0.2.0',
 		dependencies:        '',
-		credentials:         `certbot_dns_ispconfig:dns_ispconfig_username = myremoteuser
-certbot_dns_ispconfig:dns_ispconfig_password = verysecureremoteuserpassword
-certbot_dns_ispconfig:dns_ispconfig_endpoint = https://localhost:8080`,
-		full_plugin_name: 'certbot-dns-ispconfig:dns-ispconfig',
+		credentials:         `dns_ispconfig_username = myremoteuser
+dns_ispconfig_password = verysecureremoteuserpassword
+dns_ispconfig_endpoint = https://localhost:8080`,
+		full_plugin_name: 'dns-ispconfig',
 	},
 	//####################################################//
 	isset: {
@ -299,27 +303,27 @@ certbot_dns_ispconfig:dns_ispconfig_endpoint = https://localhost:8080`,
 		package_name:        'certbot-dns-isset',
 		version_requirement: '~=0.0.3',
 		dependencies:        '',
-		credentials:         `certbot_dns_isset:dns_isset_endpoint="https://customer.isset.net/api"
-certbot_dns_isset:dns_isset_token="<token>"`,
-		full_plugin_name: 'certbot-dns-isset:dns-isset',
+		credentials:         `dns_isset_endpoint="https://customer.isset.net/api"
+dns_isset_token="<token>"`,
+		full_plugin_name: 'dns-isset',
 	},
 	joker: {
 		display_name:        'Joker',
 		package_name:        'certbot-dns-joker',
 		version_requirement: '~=1.1.0',
 		dependencies:        '',
-		credentials:         `certbot_dns_joker:dns_joker_username = <Dynamic DNS Authentication Username>
-certbot_dns_joker:dns_joker_password = <Dynamic DNS Authentication Password>
-certbot_dns_joker:dns_joker_domain = <Dynamic DNS Domain>`,
-		full_plugin_name: 'certbot-dns-joker:dns-joker',
+		credentials:         `dns_joker_username = <Dynamic DNS Authentication Username>
+dns_joker_password = <Dynamic DNS Authentication Password>
+dns_joker_domain = <Dynamic DNS Domain>`,
+		full_plugin_name: 'dns-joker',
 	},
 	//####################################################//
 	linode: {
-		display_name: 'Linode',
-		package_name: 'certbot-dns-linode',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies: '',
-		credentials:  `dns_linode_key = 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ64
+		display_name:        'Linode',
+		package_name:        'certbot-dns-linode',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         `dns_linode_key = 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ64
 dns_linode_version = [<blank>|3|4]`,
 		full_plugin_name: 'dns-linode',
 	},
@ -335,11 +339,11 @@ dns_loopia_password = abcdef0123456789abcdef01234567abcdef0123`,
 	},
 	//####################################################//
 	luadns: {
-		display_name: 'LuaDNS',
-		package_name: 'certbot-dns-luadns',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies: '',
-		credentials:  `dns_luadns_email = user@example.com
+		display_name:        'LuaDNS',
+		package_name:        'certbot-dns-luadns',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         `dns_luadns_email = user@example.com
 dns_luadns_token = 0123456789abcdef0123456789abcdef`,
 		full_plugin_name: 'dns-luadns',
 	},
@ -349,10 +353,10 @@ dns_luadns_token = 0123456789abcdef0123456789abcdef`,
 		package_name:        'certbot-dns-netcup',
 		version_requirement: '~=1.0.0',
 		dependencies:        '',
-		credentials:         `certbot_dns_netcup:dns_netcup_customer_id  = 123456
-certbot_dns_netcup:dns_netcup_api_key      = 0123456789abcdef0123456789abcdef01234567
-certbot_dns_netcup:dns_netcup_api_password = abcdef0123456789abcdef01234567abcdef0123`,
-		full_plugin_name: 'certbot-dns-netcup:dns-netcup',
+		credentials:         `dns_netcup_customer_id  = 123456
+dns_netcup_api_key      = 0123456789abcdef0123456789abcdef01234567
+dns_netcup_api_password = abcdef0123456789abcdef01234567abcdef0123`,
+		full_plugin_name: 'dns-netcup',
 	},
 	//####################################################//
 	njalla: {
@ -360,17 +364,17 @@ certbot_dns_netcup:dns_netcup_api_password = abcdef0123456789abcdef01234567abcde
 		package_name:        'certbot-dns-njalla',
 		version_requirement: '~=1.0.0',
 		dependencies:        '',
-		credentials:         'certbot_dns_njalla:dns_njalla_token = 0123456789abcdef0123456789abcdef01234567',
-		full_plugin_name:    'certbot-dns-njalla:dns-njalla',
+		credentials:         'dns_njalla_token = 0123456789abcdef0123456789abcdef01234567',
+		full_plugin_name:    'dns-njalla',
 	},
 	//####################################################//
 	nsone: {
-		display_name:     'NS1',
-		package_name:     'certbot-dns-nsone',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies:     '',
-		credentials:      'dns_nsone_api_key = MDAwMDAwMDAwMDAwMDAw',
-		full_plugin_name: 'dns-nsone',
+		display_name:        'NS1',
+		package_name:        'certbot-dns-nsone',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         'dns_nsone_api_key = MDAwMDAwMDAwMDAwMDAw',
+		full_plugin_name:    'dns-nsone',
 	},
 	//####################################################//
 	oci: {
@ -388,11 +392,11 @@ key_file = ~/.oci/oci_api_key.pem`,
 	},
 	//####################################################//
 	ovh: {
-		display_name: 'OVH',
-		package_name: 'certbot-dns-ovh',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies: '',
-		credentials:  `dns_ovh_endpoint = ovh-eu
+		display_name:        'OVH',
+		package_name:        'certbot-dns-ovh',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         `dns_ovh_endpoint = ovh-eu
 dns_ovh_application_key = MDAwMDAwMDAwMDAw
 dns_ovh_application_secret = MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
 dns_ovh_consumer_key = MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw`,
@ -414,9 +418,9 @@ dns_porkbun_secret=your-porkbun-api-secret`,
 		package_name:        'certbot-dns-powerdns',
 		version_requirement: '~=0.2.0',
 		dependencies:        '',
-		credentials:         `certbot_dns_powerdns:dns_powerdns_api_url = https://api.mypowerdns.example.org
-certbot_dns_powerdns:dns_powerdns_api_key = AbCbASsd!@34`,
-		full_plugin_name: 'certbot-dns-powerdns:dns-powerdns',
+		credentials:         `dns_powerdns_api_url = https://api.mypowerdns.example.org
+dns_powerdns_api_key = AbCbASsd!@34`,
+		full_plugin_name: 'dns-powerdns',
 	},
 	//####################################################//
 	regru: {
@ -430,11 +434,11 @@ certbot_regru:dns_password=password`,
 	},
 	//####################################################//
 	rfc2136: {
-		display_name: 'RFC 2136',
-		package_name: 'certbot-dns-rfc2136',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies: '',
-		credentials:  `# Target DNS server
+		display_name:        'RFC 2136',
+		package_name:        'certbot-dns-rfc2136',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         `# Target DNS server
 dns_rfc2136_server = 192.0.2.1
 # Target DNS port
 dns_rfc2136_port = 53
@ -448,11 +452,11 @@ dns_rfc2136_algorithm = HMAC-SHA512`,
 	},
 	//####################################################//
 	route53: {
-		display_name: 'Route 53 (Amazon)',
-		package_name: 'certbot-dns-route53',
-		// version_requirement: '', // Official plugin, no version requirement
-		dependencies: '',
-		credentials:  `[default]
+		display_name:        'Route 53 (Amazon)',
+		package_name:        'certbot-dns-route53',
+		version_requirement: '==$(certbot --version | grep -Eo \'[0-9](\\.[0-9]+)+\')', // official plugin, use certbot version
+		dependencies:        '',
+		credentials:         `[default]
 aws_access_key_id=AKIAIOSFODNN7EXAMPLE
 aws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY`,
 		full_plugin_name: 'dns-route53',
@ -463,9 +467,9 @@ aws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY`,
 		package_name:        'certbot-dns-transip',
 		version_requirement: '~=0.3.3',
 		dependencies:        '',
-		credentials:         `certbot_dns_transip:dns_transip_username = my_username
-certbot_dns_transip:dns_transip_key_file = /etc/letsencrypt/transip-rsa.key`,
-		full_plugin_name: 'certbot-dns-transip:dns-transip',
+		credentials:         `dns_transip_username = my_username
+dns_transip_key_file = /etc/letsencrypt/transip-rsa.key`,
+		full_plugin_name: 'dns-transip',
 	},
 	//####################################################//
 	vultr: {
@ -473,7 +477,18 @@ certbot_dns_transip:dns_transip_key_file = /etc/letsencrypt/transip-rsa.key`,
 		package_name:        'certbot-dns-vultr',
 		version_requirement: '~=1.0.3',
 		dependencies:        '',
-		credentials:         'certbot_dns_vultr:dns_vultr_key = YOUR_VULTR_API_KEY',
-		full_plugin_name:    'certbot-dns-vultr:dns-vultr',
+		credentials:         'dns_vultr_key = YOUR_VULTR_API_KEY',
+		full_plugin_name:    'dns-vultr',
+	},
+	//####################################################//
+	websupportsk: {
+		display_name:        'Websupport.sk',
+		package_name:        'certbot-dns-websupportsk',
+		version_requirement: '~=0.1.6',
+		dependencies:        '',
+		credentials:         `dns_websupportsk_api_key = <api_key>
+dns_websupportsk_secret = <secret>
+dns_websupportsk_domain = example.com`,
+		full_plugin_name: 'dns-websupportsk',
 	},
 };
Author	SHA1	Message	Date
chaptergy	747de511d4	Sets certbot official dns plugin version requirement to match certbot version	2021-12-29 09:54:59 +01:00
jc21	adc5a2020a	Merge pull request #1666 from TobiasKneidl/patch-1 Update default.conf to follow the default site setting also for ipv6	2021-12-27 11:03:14 +10:00
jc21	40b1521f72	Merge pull request #1677 from jc21/fixes-custom-certificate-modal Fixes custom certificate upload modal	2021-12-27 11:02:16 +10:00
chaptergy	ac23c66659	Fixes custom certificate upload modal	2021-12-23 12:23:30 +01:00
jc21	6392df36c3	Merge branch 'master' into develop	2021-12-22 11:52:27 +10:00
Jamie Curnow	c82843279c	Bump version	2021-12-22 11:51:32 +10:00
Jamie Curnow	b394eb8e55	Hack for python binary in newer node images	2021-12-22 11:05:57 +10:00
Tobias Kneidl	bb422d4454	Update default.conf	2021-12-22 00:24:05 +01:00
jc21	d45f39aae3	Merge pull request #1538 from jc21/adds-http-challenge-test Adds buttons to test availability of server from public internet	2021-11-10 09:15:26 +10:00
jc21	cb091040a8	Merge pull request #1578 from jc21/undo-switch-to-variables Reverts back to proxy_pass without variables	2021-11-10 09:13:02 +10:00
chaptergy	ddd538944a	Skip migration if setting does not exist	2021-11-09 14:03:39 +01:00
chaptergy	1f879f67a9	Reverts back to proxy_pass without variables	2021-11-09 13:57:39 +01:00
Chaptergy	ee89dedd0f	Adds migration to regenerate default host	2021-11-08 23:11:56 +01:00
jc21	9ab5333652	Merge pull request #1574 from jc21/develop v2.9.12	2021-11-08 14:34:31 +10:00
Jamie Curnow	3bd97ae1b0	Version bump	2021-11-08 13:37:44 +10:00
jc21	432062e0f4	Merge pull request #1559 from jc21/variable-fix-custom-locations Fixes custom location with capture groups	2021-11-08 12:29:43 +10:00
jc21	0c8bbb4bc2	Merge pull request #1561 from jc21/header-warning-for-advanced-config Adds advanced config header warning	2021-11-08 12:28:34 +10:00
jc21	48e96c46d5	Merge pull request #1565 from jc21/removes-hsts-from-admin-ui Removes HSTS from admin ui	2021-11-08 12:27:36 +10:00
jc21	25e9acf618	Merge pull request #1566 from jc21/cleans-dependencies Removes unused dependencies	2021-11-08 12:27:04 +10:00
jc21	a517e80236	Merge pull request #1567 from jc21/removes-renew-delay Removes random delay when renewing certificates with the renew now button	2021-11-08 12:26:34 +10:00
jc21	3d4d3bc73b	Merge pull request #1572 from jc21/letsencrypt-config-file Uses letsencrypt config file everywhere	2021-11-08 12:25:48 +10:00
Julian Reinhardt	cf4d1f73fa	Uses letsencrypt config file everywhere	2021-11-06 22:31:13 +01:00
Julian Reinhardt	c203d1a0d8	Requires ~() in location to remove $request_uri and removes $request_uri if it is just a slash	2021-11-06 13:38:02 +01:00
Julian Reinhardt	5f29f6b039	Removes random delay when renewing certificates with the renew now button	2021-11-05 14:20:12 +01:00
Julian Reinhardt	f75b5b867b	Fixes formatting	2021-11-05 14:01:50 +01:00
Julian Reinhardt	67463ca136	Removes unused dependencies	2021-11-05 13:59:19 +01:00
Julian Reinhardt	8db541f37f	Removes HSTS from admin ui	2021-11-05 00:09:05 +01:00
Julian Reinhardt	a5229d0e92	Adds advanced config header warning and replaces variable info with translation	2021-11-04 12:01:01 +01:00
Julian Reinhardt	38ec0f9f95	Adds logs to backend when testing http challenge	2021-11-04 11:16:23 +01:00
Julian Reinhardt	3d80759a21	Renames the $upstream variables and does not append $request_ui if capture group exists in location	2021-11-04 10:08:15 +01:00
jc21	d95cd36b3e	Merge pull request #1544 from piuswalter/patch-1 Fixed typo in i18n translation file	2021-11-03 09:42:49 +10:00
jc21	4c6b96ad5d	Merge pull request #1546 from jc21/removes-swagger-containter Removes swagger container	2021-11-03 09:41:41 +10:00
jc21	c3bef2867e	Merge pull request #1547 from jc21/makes-sqlite-default Changes documentation to make SQLite the default db	2021-11-03 09:41:02 +10:00
Julian Reinhardt	efc5bff2e1	Makes SQLite the default database in documentation	2021-11-02 12:24:23 +01:00
Julian Reinhardt	ffe3db8c08	Falls back to SQLite if no environment variables are provided	2021-11-02 12:22:39 +01:00
Julian Reinhardt	4ada0feae3	Removes swagger container and adds exposed port for DB in dev env	2021-11-02 11:33:22 +01:00
Pius Walter	e17de6058e	Fixed typo	2021-11-01 17:43:46 +01:00
Julian Reinhardt	9efe6cfb39	Minor fixes	2021-10-31 13:41:29 +01:00
Julian Reinhardt	c86a1a50bd	Fixes formatting	2021-10-31 00:28:43 +02:00
Julian Reinhardt	c55476b196	Adds buttons to test availability of server from public internet	2021-10-31 00:19:18 +02:00
jc21	3b47decbb0	Merge pull request #1528 from jc21/develop v2.9.11	2021-10-27 22:11:55 +10:00
Jamie Curnow	d0bfa082e0	Bump version	2021-10-27 21:43:07 +10:00
jc21	6b7a8b009e	Merge pull request #1519 from jc21/fixes-incorrect-proxy-path Updates proxy paths	2021-10-27 21:42:18 +10:00
Julian Reinhardt	ca59e585d8	Uses variable in proxy_pass for normal proxy hosts	2021-10-25 14:58:02 +02:00
Julian Reinhardt	bbde7a108a	Use variable with full uri in proxy pass	2021-10-25 14:48:22 +02:00
Julian Reinhardt	87731a8b5c	Revert "Utilise variable for custom locations proxy_pass" This reverts commit `6c1ae77a2a`.	2021-10-25 14:27:37 +02:00
jc21	29d4bd4ccf	Merge pull request #1517 from jc21/develop v2.9.10	2021-10-25 15:48:43 +10:00
jc21	925ad90f91	Merge branch 'master' into develop	2021-10-25 14:26:47 +10:00
Jamie Curnow	650ae61c43	Version bump	2021-10-25 11:35:44 +10:00
jc21	02f3f9704f	Merge pull request #1480 from jc21/prefer-isrg-cert-chain Sets the cert chain to prefer ISRG Root X1	2021-10-25 08:42:31 +10:00
jc21	da7c3057b4	Merge pull request #1481 from jc21/certificate-no-domain-sorting Removes sorting of domain names when creating a certificate	2021-10-25 08:40:19 +10:00
jc21	040b45cafa	Merge pull request #1496 from jc21/fixes-cache-busting Adds cache busting to js bundles as well	2021-10-25 08:30:15 +10:00
jc21	8ece310b9f	Merge pull request #1514 from jc21/adds-dns-websupportsk-challenge Adds Webbsupport.sk dns plugin	2021-10-25 08:26:20 +10:00
jc21	96959db3c2	Merge pull request #1504 from jc21/removes-certbot-plugin-prefixes Removes certbot plugin prefixes	2021-10-25 08:26:03 +10:00
Julian Reinhardt	6360100611	Adds Webbsupport.sk dns plugin	2021-10-24 22:14:59 +02:00
Julian Reinhardt	b833044cea	Fixes formatting	2021-10-20 18:38:21 +02:00
Julian Reinhardt	97909830f5	Removes dns plugin prefixes	2021-10-20 18:16:54 +02:00
Julian Reinhardt	8ae2de2f49	Updates certbot-dns-ionos to newest version	2021-10-20 18:08:11 +02:00
chaptergy	bf7b659e89	Adds cache busting to js bundles as well	2021-10-17 19:15:35 +02:00
chaptergy	4e3c7749af	Removes sorting of domain names when creating a certificate	2021-10-12 16:18:11 +02:00
chaptergy	f63441921f	Sets the cert chain to prefer ISRG Root X1	2021-10-12 16:11:47 +02:00
jc21	06c5f991e7	Merge pull request #1390 from jc21/develop v2.9.9	2021-09-10 13:50:47 +10:00
 @ -1 +1 @@
 .9.9
 .9.13