From c26ce2083f7225af7e660bad09247ae19ec20d2f Mon Sep 17 00:00:00 2001 From: Razvan Stoica Date: Sun, 21 Mar 2021 18:02:53 +0200 Subject: [PATCH 01/28] Add new details about how to run this image on a Raspberry Pi device. --- README.md | 61 ++++++++++++++++++++++++++++++++++++- docs/README.md | 72 -------------------------------------------- docs/setup/README.md | 66 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 120 insertions(+), 79 deletions(-) diff --git a/README.md b/README.md index 6e714071..2b28752f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This project comes as a pre-built docker image that enables you to easily forward to your websites running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt. -- [Quick Setup](https://nginxproxymanager.com#quick-setup) +- [Quick Setup](#quick-setup) - [Full Setup](https://nginxproxymanager.com/setup/) - [Screenshots](https://nginxproxymanager.com/screenshots/) @@ -52,6 +52,65 @@ I won't go in to too much detail here but here are the basics for someone new to 3. Configure your domain name details to point to your home, either with a static ip or a service like DuckDNS or [Amazon Route53](https://github.com/jc21/route53-ddns) 4. Use the Nginx Proxy Manager as your gateway to forward to your other web based services +## Quick Setup + +1. Install Docker and Docker-Compose + +- [Docker Install documentation](https://docs.docker.com/install/) +- [Docker-Compose Install documentation](https://docs.docker.com/compose/install/) + +2. Create a docker-compose.yml file similar to this: + +```yml +version: '3' +services: + app: + image: 'jc21/nginx-proxy-manager:latest' + ports: + - '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' + 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 + +```bash +docker-compose up -d +``` + +4. Log in to the Admin UI + +When your docker container is running, connect to it on port `81` for the admin interface. +Sometimes this can take a little bit because of the entropy of keys. + +[http://127.0.0.1:81](http://127.0.0.1:81) + +Default Admin User: +``` +Email: admin@example.com +Password: changeme +``` + +Immediately after logging in with this default user you will be asked to modify your details and change your password. + ## Contributors diff --git a/docs/README.md b/docs/README.md index d19655c5..082bb05c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -37,75 +37,3 @@ footer: MIT Licensed | Copyright © 2016-present jc21.com

Configure other users to either view or manage their own hosts. Full access permissions are available.

- -### Quick Setup - -1. Install Docker and Docker-Compose - -- [Docker Install documentation](https://docs.docker.com/install/) -- [Docker-Compose Install documentation](https://docs.docker.com/compose/install/) - -2. Create a docker-compose.yml file similar to this: - -```yml -version: '3' -services: - app: - image: 'jc21/nginx-proxy-manager:latest' - ports: - - '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' - 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 - -```bash -docker-compose up -d -``` - -4. Log in to the Admin UI - -When your docker container is running, connect to it on port `81` for the admin interface. -Sometimes this can take a little bit because of the entropy of keys. - -[http://127.0.0.1:81](http://127.0.0.1:81) - -Default Admin User: - -``` -Email: admin@example.com -Password: changeme -``` - -Immediately after logging in with this default user you will be asked to modify your details and change your password. - -5. Upgrading to new versions - -```bash -docker-compose pull -docker-compose up -d -``` - -This project will automatically update any databases or other requirements so you don't have to follow -any crazy instructions. These steps above will pull the latest updates and recreate the docker -containers. - diff --git a/docs/setup/README.md b/docs/setup/README.md index 457674a5..baed0735 100644 --- a/docs/setup/README.md +++ b/docs/setup/README.md @@ -1,6 +1,6 @@ # Full Setup Instructions -### MySQL Database +## MySQL 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: @@ -16,7 +16,7 @@ When using a `mariadb` database, the NPM configuration file should still use the ::: -### Running the App +## Running the App Via `docker-compose`: @@ -70,7 +70,7 @@ Then: docker-compose up -d ``` -### Running on Raspberry PI / ARM devices +## Running on Raspberry PI / ARM devices The docker images support the following architectures: - amd64 @@ -87,8 +87,62 @@ 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`: -### Initial Run +```yml +version: "3" +services: + app: + image: 'jc21/nginx-proxy-manager:latest' + restart: always + ports: + # Public HTTP Port: + - '8080:80' + # Public HTTPS Port: + - '4443:443' + # Admin Web Port: + - '8181: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: ghcr.io/linuxserver/mariadb + restart: unless-stopped + environment: + PUID: 1001 + PGID: 1001 + TZ: "Europe/London" + MYSQL_ROOT_PASSWORD: "changeme" + MYSQL_DATABASE: "npm" + MYSQL_USER: "changeuser" + MYSQL_PASSWORD: "changepass" + volumes: + - ./data/mariadb:/config +``` + +_Please note, that `DB_MYSQL_*` environment variables will take precedent over `DB_SQLITE_*` var> + +Then: + +```bash +docker-compose up -d +``` + +## Initial Run After the app is running for the first time, the following will happen: @@ -99,7 +153,7 @@ After the app is running for the first time, the following will happen: This process can take a couple of minutes depending on your machine. -### Default Administrator User +## Default Administrator User ``` Email: admin@example.com @@ -108,7 +162,7 @@ Password: changeme Immediately after logging in with this default user you will be asked to modify your details and change your password. -### Configuration File +## Configuration File ::: warning From 61d99561c16046751fb59be6fbf88684b69b506a Mon Sep 17 00:00:00 2001 From: Razvan Stoica Date: Mon, 22 Mar 2021 09:50:25 +0200 Subject: [PATCH 02/28] Set ports to default value --- docs/setup/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/setup/README.md b/docs/setup/README.md index baed0735..08e9af96 100644 --- a/docs/setup/README.md +++ b/docs/setup/README.md @@ -97,11 +97,11 @@ services: restart: always ports: # Public HTTP Port: - - '8080:80' + - '80:80' # Public HTTPS Port: - - '4443:443' + - '443:443' # Admin Web Port: - - '8181:81' + - '81:81' environment: # These are the settings to access your db DB_MYSQL_HOST: "db" From 5fc704ccad3330090410bf2950604a597876fea5 Mon Sep 17 00:00:00 2001 From: RBXII3 <22587474+psharma04@users.noreply.github.com> Date: Tue, 23 Mar 2021 13:49:14 +1100 Subject: [PATCH 03/28] Add info about SSL --- frontend/js/i18n/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/js/i18n/messages.json b/frontend/js/i18n/messages.json index 3437b109..64b26cc3 100644 --- a/frontend/js/i18n/messages.json +++ b/frontend/js/i18n/messages.json @@ -183,7 +183,7 @@ "delete": "Delete SSL Certificate", "delete-confirm": "Are you sure you want to delete this SSL Certificate? Any hosts using it will need to be updated later.", "help-title": "SSL Certificates", - "help-content": "TODO", + "help-content": "SSL certificates (correctly known as 'TLS Certificates') are a form of encryption key which allows your site to be encrypted for the end user. \mNPM uses a service called Let's Encrypt to issue SSL certificates for free.\nIf you have any sort of personal information, passwords, or sensitive data behind NPM, it's probably a good idea to use a certificate.\nNPM also supports DNS authentication for if you're not running your site facing the internet, or if you just want a wildcard certificate.", "other-certificate": "Certificate", "other-certificate-key": "Certificate Key", "other-intermediate-certificate": "Intermediate Certificate", From f0233b947e0179e224e3ffc4aa265fd472e821bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 May 2021 03:51:51 +0000 Subject: [PATCH 04/28] Bump ua-parser-js from 0.7.21 to 0.7.28 in /frontend Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.21 to 0.7.28. - [Release notes](https://github.com/faisalman/ua-parser-js/releases) - [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.21...0.7.28) Signed-off-by: dependabot[bot] --- frontend/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index b14a4929..3d6fcad1 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -6560,9 +6560,9 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= ua-parser-js@^0.7.9: - version "0.7.21" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777" - integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ== + version "0.7.28" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" + integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== uglify-js@3.4.x: version "3.4.10" From e283865d3dfba4bcc52d376853c37cb89358c32f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 02:11:13 +0000 Subject: [PATCH 05/28] Bump lodash from 4.17.19 to 4.17.21 in /frontend Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21) Signed-off-by: dependabot[bot] --- frontend/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index b14a4929..ab27b098 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4278,9 +4278,9 @@ lodash.some@^4.6.0: 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.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== longest@^1.0.1: version "1.0.1" From 7deb64a5de59631ea7d1148ee90e358d169c6387 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 02:11:35 +0000 Subject: [PATCH 06/28] Bump lodash from 4.17.19 to 4.17.21 in /backend Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21) Signed-off-by: dependabot[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index b4edda63..2130c7b8 100644 --- a/backend/package.json +++ b/backend/package.json @@ -19,7 +19,7 @@ "jsonwebtoken": "^8.5.1", "knex": "^0.20.13", "liquidjs": "^9.11.10", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "moment": "^2.24.0", "mysql": "^2.18.1", "node-rsa": "^1.0.8", diff --git a/backend/yarn.lock b/backend/yarn.lock index 84d72237..84180c26 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2024,10 +2024,10 @@ lodash.once@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= -lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== +lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" From bf8ea71c779f5ab7d6f70ab856c420d54a404301 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 May 2021 02:12:03 +0000 Subject: [PATCH 07/28] Bump hosted-git-info from 2.8.8 to 2.8.9 in /frontend Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) Signed-off-by: dependabot[bot] --- frontend/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index b14a4929..cfb1e857 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -3541,9 +3541,9 @@ homedir-polyfill@^1.0.1: parse-passwd "^1.0.0" hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== html-minifier-terser@^5.0.1: version "5.1.1" From 3e600552dc4c63274158fda2ab928fcc4ff1f0f0 Mon Sep 17 00:00:00 2001 From: chaptergy <26956711+chaptergy@users.noreply.github.com> Date: Sun, 9 May 2021 19:45:42 +0200 Subject: [PATCH 08/28] Adds regru dns provider Issue #938 --- global/certbot-dns-plugins.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index 0c4e3b39..35a8395a 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -254,6 +254,16 @@ certbot_dns_powerdns:dns_powerdns_api_key = AbCbASsd!@34`, full_plugin_name: 'certbot-dns-powerdns:dns-powerdns', }, //####################################################// + regru: { + display_name: 'reg.ru', + package_name: 'certbot-regru', + package_version: '1.0.2', + dependencies: '', + credentials: `certbot_regru:dns_username=username +certbot_regru:dns_password=password`, + full_plugin_name: 'certbot-regru:dns', + }, + //####################################################// rfc2136: { display_name: 'RFC 2136', package_name: 'certbot-dns-rfc2136', From 7c2540b193a4ef6562ed9d7492d094feaad6b419 Mon Sep 17 00:00:00 2001 From: chaptergy <26956711+chaptergy@users.noreply.github.com> Date: Sun, 9 May 2021 19:46:20 +0200 Subject: [PATCH 09/28] Adds Azure dns provider Issue #864 --- global/certbot-dns-plugins.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index 35a8395a..b9001ffb 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -30,6 +30,32 @@ certbot_dns_aliyun:dns_aliyun_access_key_secret = 1234567890abcdef1234567890abcd full_plugin_name: 'certbot-dns-aliyun:dns-aliyun', }, //####################################################// + azure: { + display_name: 'Azure', + package_name: 'certbot-dns-azure', + package_version: '1.1.0', + dependencies: '', + credentials: `# This plugin supported API authentication using either Service Principals or utilizing a Managed Identity assigned to the virtual machine. +# Regardless which authentication method used, the identity will need the “DNS Zone Contributor” role assigned to it. +# As multiple Azure DNS Zones in multiple resource groups can exist, the config file needs a mapping of zone to resource group ID. Multiple zones -> ID mappings can be listed by using the key dns_azure_zoneX where X is a unique number. At least 1 zone mapping is required. + +# Using a service principal (option 1) +dns_azure_sp_client_id = 912ce44a-0156-4669-ae22-c16a17d34ca5 +dns_azure_sp_client_secret = E-xqXU83Y-jzTI6xe9fs2YC~mck3ZzUih9 +dns_azure_tenant_id = ed1090f3-ab18-4b12-816c-599af8a88cf7 + +# Using used assigned MSI (option 2) +# dns_azure_msi_client_id = 912ce44a-0156-4669-ae22-c16a17d34ca5 + +# Using system assigned MSI (option 3) +# dns_azure_msi_system_assigned = true + +# Zones (at least one always required) +dns_azure_zone1 = example.com:/subscriptions/c135abce-d87d-48df-936c-15596c6968a5/resourceGroups/dns1 +dns_azure_zone2 = example.org:/subscriptions/99800903-fb14-4992-9aff-12eaf2744622/resourceGroups/dns2`, + full_plugin_name: 'dns-azure', + }, + //####################################################// cloudflare: { display_name: 'Cloudflare', package_name: 'certbot-dns-cloudflare', From c9daf19940887afba6ffa515016a7de6ee89d4a8 Mon Sep 17 00:00:00 2001 From: chaptergy <26956711+chaptergy@users.noreply.github.com> Date: Sun, 9 May 2021 21:36:52 +0200 Subject: [PATCH 10/28] Reorders some providers alphabetically --- global/certbot-dns-plugins.js | 72 +++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index b9001ffb..46828706 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -20,6 +20,16 @@ */ module.exports = { + //####################################################// + acmedns: { + display_name: 'ACME-DNS', + package_name: 'certbot-dns-acmedns', + package_version: '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', + }, aliyun: { display_name: 'Aliyun', package_name: 'certbot-dns-aliyun', @@ -97,6 +107,15 @@ certbot_dns_cpanel:cpanel_password = hunter2`, full_plugin_name: 'certbot-dns-cpanel:cpanel', }, //####################################################// + duckdns: { + display_name: 'DuckDNS', + package_name: 'certbot-dns-duckdns', + package_version: '0.5', + dependencies: '', + credentials: 'dns_duckdns_token=', + full_plugin_name: 'dns-duckdns', + }, + //####################################################// digitalocean: { display_name: 'DigitalOcean', package_name: 'certbot-dns-digitalocean', @@ -146,6 +165,17 @@ certbot_dns_dnspod:dns_dnspod_api_token = "DNSPOD-API-TOKEN"`, full_plugin_name: 'certbot-dns-dnspod:dns-dnspod', }, //####################################################// + eurodns: { + display_name: 'EuroDNS', + package_name: 'certbot-dns-eurodns', + package_version: '0.0.4', + dependencies: '', + 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', + }, + //####################################################// gandi: { display_name: 'Gandi Live DNS', package_name: 'certbot_plugin_gandi', @@ -319,26 +349,6 @@ aws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY`, full_plugin_name: 'dns-route53', }, //####################################################// - vultr: { - display_name: 'Vultr', - package_name: 'certbot-dns-vultr', - package_version: '1.0.3', - dependencies: '', - credentials: 'certbot_dns_vultr:dns_vultr_key = YOUR_VULTR_API_KEY', - full_plugin_name: 'certbot-dns-vultr:dns-vultr', - }, - //####################################################// - eurodns: { - display_name: 'EuroDNS', - package_name: 'certbot-dns-eurodns', - package_version: '0.0.4', - dependencies: '', - 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', - }, - //####################################################// transip: { display_name: 'TransIP', package_name: 'certbot-dns-transip', @@ -349,22 +359,12 @@ certbot_dns_transip:dns_transip_key_file = /etc/letsencrypt/transip-rsa.key`, full_plugin_name: 'certbot-dns-transip:dns-transip', }, //####################################################// - acmedns: { - display_name: 'ACME-DNS', - package_name: 'certbot-dns-acmedns', - package_version: '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', - }, - //####################################################// - duckdns: { - display_name: 'DuckDNS', - package_name: 'certbot-dns-duckdns', - package_version: '0.5', + vultr: { + display_name: 'Vultr', + package_name: 'certbot-dns-vultr', + package_version: '1.0.3', dependencies: '', - credentials: '', - full_plugin_name: 'certbot-dns-duckdns:dns-duckdns', + credentials: 'certbot_dns_vultr:dns_vultr_key = YOUR_VULTR_API_KEY', + full_plugin_name: 'certbot-dns-vultr:dns-vultr', }, }; From cd4caea2dc59f4d107a1e918a24a306f42dca5dc Mon Sep 17 00:00:00 2001 From: chaptergy <26956711+chaptergy@users.noreply.github.com> Date: Sun, 9 May 2021 21:47:30 +0200 Subject: [PATCH 11/28] Adds coudns dns provider --- global/certbot-dns-plugins.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index 46828706..85592b3c 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -76,6 +76,22 @@ dns_cloudflare_api_token = 0123456789abcdef0123456789abcdef01234567`, full_plugin_name: 'dns-cloudflare', }, //####################################################// + cloudns: { + display_name: 'ClouDNS', + package_name: 'certbot-dns-cloudns', + package_version: '0.4.0', + dependencies: '', + credentials: `# Target user ID (see https://www.cloudns.net/api-settings/) + dns_cloudns_auth_id=1234 + # Alternatively, one of the following two options can be set: + # dns_cloudns_sub_auth_id=1234 + # dns_cloudns_sub_auth_user=foobar + + # API password + dns_cloudns_auth_password=password1`, + full_plugin_name: 'dns-cloudns', + }, + //####################################################// cloudxns: { display_name: 'CloudXNS', package_name: 'certbot-dns-cloudxns', From 62a708b416f07b0847bf0715bc9950f3af753fa2 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Mon, 10 May 2021 08:18:19 +1000 Subject: [PATCH 12/28] Version bump --- .version | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.version b/.version index dedcc7d4..5d9ade10 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.9.1 +2.9.2 diff --git a/README.md b/README.md index 2ec9395f..98419212 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@



- + From 899b487daa9105592e25fefeafd017edd11abbb7 Mon Sep 17 00:00:00 2001 From: chaptergy <26956711+chaptergy@users.noreply.github.com> Date: Mon, 10 May 2021 19:58:28 +0200 Subject: [PATCH 13/28] Puts backend errors into own error field --- frontend/js/app/user/password.ejs | 3 ++- frontend/js/app/user/password.js | 29 ++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/frontend/js/app/user/password.ejs b/frontend/js/app/user/password.ejs index 7dd497d1..a45cc7ed 100644 --- a/frontend/js/app/user/password.ejs +++ b/frontend/js/app/user/password.ejs @@ -4,6 +4,7 @@