Merge 60c71a7b45 into 2a06384a4a

backend/config/default.json

@@ -5,6 +5,7 @@
     "name": "npm",
     "user": "npm",
     "password": "npm",
-    "port": 3306
+    "port": 3306,
+    "ssl": false
   }
 }

backend/db.js

@@ -16,7 +16,8 @@ function generateDbConfig() {
 			user:     cfg.user,
 			password: cfg.password,
 			database: cfg.name,
-			port:     cfg.port
+			port:     cfg.port,
+			ssl:      cfg.ssl
 		},
 		migrations: {
 			tableName: 'migrations'

backend/lib/config.js

@@ -29,6 +29,9 @@ const configure = () => {
 	const envMysqlHost = process.env.DB_MYSQL_HOST || null;
 	const envMysqlUser = process.env.DB_MYSQL_USER || null;
 	const envMysqlName = process.env.DB_MYSQL_NAME || null;
+	const envMysqlSsl  = process.env.DB_MYSQL_SSL  || null;
+	const envMysqlCa   = process.env.DB_MYSQL_CA   || '/data/mysql-ca.crt';
+
 	if (envMysqlHost && envMysqlUser && envMysqlName) {
 		// we have enough mysql creds to go with mysql
 		logger.info('Using MySQL configuration');
@@ -40,6 +43,7 @@ const configure = () => {
 				user:     envMysqlUser,
 				password: process.env.DB_MYSQL_PASSWORD,
 				name:     envMysqlName,
+				ssl:      envMysqlSsl ? { ca: fs.readFileSync(envMysqlCa) } : false
 			},
 			keys: getKeys(),
 		};

global/certbot-dns-plugins.js

@@ -66,6 +66,16 @@ dns_azure_zone2 = example.org:/subscriptions/99800903-fb14-4992-9aff-12eaf274462
 		full_plugin_name: 'dns-azure',
 	},
 	//####################################################//
+	bunny: {
+		display_name:        'BunnyCDN',
+		package_name:        'certbot-dns-bunny',
+		version_requirement: '~=0.0.9',
+		dependencies:        '',
+		credentials:         `# Bunny CDN API token
+dns_bunny_api_key = <a65e8ebd-45ab-44d2-a542-40d4d009e3bf>`,
+		full_plugin_name: 'dns-bunny',
+	},
+	//####################################################//
 	cloudflare: {
 		display_name:        'Cloudflare',
 		package_name:        'certbot-dns-cloudflare',