Merge remote-tracking branch 'upstream/develop' into develop

.version

@@ -1 +1 @@
-2.11.2
+2.11.3

backend/setup.js

@@ -22,11 +22,14 @@ const setupDefaultUser = () => {
 		.then((row) => {
 			if (!row.count) {
 				// Create a new user and set password
-				logger.info('Creating a new user: admin@example.com with password: iArhP1j7p1P6TA92FA2FMbbUGYqwcYzxC4AVEe12Wbi94FY9gNN62aKyF1shrvG4NycjjX9KfmDQiwkLZH1ZDR9xMjiG2QmoHXi');
+				let email    = process.env.INITIAL_ADMIN_EMAIL || 'admin@example.com';
+				let password = process.env.INITIAL_ADMIN_PASSWORD || 'iArhP1j7p1P6TA92FA2FMbbUGYqwcYzxC4AVEe12Wbi94FY9gNN62aKyF1shrvG4NycjjX9KfmDQiwkLZH1ZDR9xMjiG2QmoHXi';
+				
+				logger.info('Creating a new user: ' + email + ' with password: ' + password);
 
 				const data = {
 					is_deleted: 0,
-					email: 'admin@example.com',
+					email:      email,
 					name:       'Administrator',
 					nickname:   'Admin',
 					avatar:     '',
@@ -42,7 +45,7 @@ const setupDefaultUser = () => {
 							.insert({
 								user_id: user.id,
 								type:    'password',
-								secret: 'iArhP1j7p1P6TA92FA2FMbbUGYqwcYzxC4AVEe12Wbi94FY9gNN62aKyF1shrvG4NycjjX9KfmDQiwkLZH1ZDR9xMjiG2QmoHXi',
+								secret:  password,
 								meta:    {},
 							})
 							.then(() => {

global/certbot-dns-plugins.json

@@ -346,5 +346,11 @@
     "package_name": "certbot-dns-websupport",
     "credentials": "dns_websupport_identifier = <api_key>\ndns_websupport_secret_key = <secret>",
     "full_plugin_name": "dns-websupport"
+  },
+  "wedos":{
+    "name": "Wedos",
+	"package_name": "certbot-dns-wedos",
+	"credentials": "dns_wedos_user = <wedos_registration>\ndns_wedos_auth = <wapi_sha256_password>",
+	"full_plugin_name": "dns-wedos"
   }
 }