diff --git a/.version b/.version index 9e5bb77a..22e3b6b0 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.11.2 +2.11.3 diff --git a/backend/setup.js b/backend/setup.js index 0569e3b9..690c3a01 100644 --- a/backend/setup.js +++ b/backend/setup.js @@ -22,15 +22,18 @@ 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', - name: 'Administrator', - nickname: 'Admin', - avatar: '', - roles: ['admin'], + email: email, + name: 'Administrator', + nickname: 'Admin', + avatar: '', + roles: ['admin'], }; return userModel @@ -41,9 +44,9 @@ const setupDefaultUser = () => { .query() .insert({ user_id: user.id, - type: 'password', - secret: 'iArhP1j7p1P6TA92FA2FMbbUGYqwcYzxC4AVEe12Wbi94FY9gNN62aKyF1shrvG4NycjjX9KfmDQiwkLZH1ZDR9xMjiG2QmoHXi', - meta: {}, + type: 'password', + secret: password, + meta: {}, }) .then(() => { return userPermissionModel.query().insert({ diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json index fd14d76c..37d697e3 100644 --- a/global/certbot-dns-plugins.json +++ b/global/certbot-dns-plugins.json @@ -26,7 +26,7 @@ "cloudflare": { "name": "Cloudflare", "package_name": "certbot-dns-cloudflare", - "credentials": "# Cloudflare API token\ndns_cloudflare_api_token = 0123456789abcdef0123456789abcdef01234567\n# OR Cloudflare API credentials\n#dns_cloudflare_email = cloudflare@example.com\n#dns_cloudflare_api_key = 0123456789abcdef0123456789abcdef01234", + "credentials": "# Cloudflare API token\ndns_cloudflare_api_token=0123456789abcdef0123456789abcdef01234567\n# OR Cloudflare API credentials\n#dns_cloudflare_email=cloudflare@example.com\n#dns_cloudflare_api_key=0123456789abcdef0123456789abcdef01234", "full_plugin_name": "dns-cloudflare" }, "cloudns": { @@ -346,5 +346,11 @@ "package_name": "certbot-dns-websupport", "credentials": "dns_websupport_identifier = \ndns_websupport_secret_key = ", "full_plugin_name": "dns-websupport" + }, + "wedos":{ + "name": "Wedos", + "package_name": "certbot-dns-wedos", + "credentials": "dns_wedos_user = \ndns_wedos_auth = ", + "full_plugin_name": "dns-wedos" } }