diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b6029bd55..6ec6a7c91 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -6,20 +6,30 @@ labels: bug assignees: '' --- - -**Are you in the right place?** + + **Checklist** - Have you pulled and found the error with `jc21/nginx-proxy-manager:latest` docker image? + - Yes / No - Are you sure you're not using someone else's docker image? -- If having problems with Lets Encrypt, have you made absolutely sure your site is accessible from outside of your network? + - Yes / No +- Have you searched for similar issues (both open and closed)? + - Yes / No **Describe the bug** -- A clear and concise description of what the bug is. -- What version of Nginx Proxy Manager is reported on the login page? + + + +**Nginx Proxy Manager Version** + + **To Reproduce** Steps to reproduce the behavior: @@ -28,14 +38,18 @@ Steps to reproduce the behavior: 3. Scroll down to '....' 4. See error + **Expected behavior** -A clear and concise description of what you expected to happen. + + **Screenshots** -If applicable, add screenshots to help explain your problem. + + **Operating System** -- Please specify if using a Rpi, Mac, orchestration tool or any other setups that might affect the reproduction of this error. + + **Additional context** -Add any other context about the problem here, docker version, browser version if applicable to the problem. Too much info is better than too little. + diff --git a/.github/ISSUE_TEMPLATE/dns_challenge_request.md b/.github/ISSUE_TEMPLATE/dns_challenge_request.md new file mode 100644 index 000000000..0a00f00f8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/dns_challenge_request.md @@ -0,0 +1,18 @@ +--- +name: DNS challenge provider request +about: Suggest a new provider to be available for a certificate DNS challenge +title: '' +labels: dns provider request +assignees: '' + +--- + +**What provider would you like to see added to NPM?** + + + +**Have you checked if a certbot plugin exists?** + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 12eb7d4c7..cf5b0f772 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -7,19 +7,26 @@ assignees: '' --- -**Are you in the right place?** + **Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + + **Describe the solution you'd like** -A clear and concise description of what you want to happen. + + **Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. + + **Additional context** -Add any other context or screenshots about the feature request here. + diff --git a/.version b/.version index 5d9ade10c..4db4b0359 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.9.2 +2.9.3 diff --git a/README.md b/README.md index 98419212e..17742cca1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@



- + @@ -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 @@ -331,6 +390,24 @@ Special thanks to the following contributors:
Filippo Baruffaldi + + + +
Bikramjeet Singh + + + + + +
Razvan Stoica + + + + + +
RBXII3 + + diff --git a/docs/README.md b/docs/README.md index d19655c5c..082bb05c1 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/package.json b/docs/package.json index 190db7631..48b375623 100644 --- a/docs/package.json +++ b/docs/package.json @@ -500,7 +500,7 @@ "pkg-up": "^3.1.0", "portfinder": "^1.0.28", "posix-character-classes": "^1.0.0", - "postcss": "^7.0.32", + "postcss": "^8.2.10", "postcss-calc": "^7.0.2", "postcss-colormin": "^4.0.3", "postcss-convert-values": "^4.0.1", diff --git a/docs/setup/README.md b/docs/setup/README.md index 1b22fe358..4d0dac98e 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`: @@ -72,7 +72,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 @@ -89,8 +89,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`: + +```yml +version: "3" +services: + app: + image: 'jc21/nginx-proxy-manager:latest' + restart: always + 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: 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 +## Initial Run After the app is running for the first time, the following will happen: @@ -101,7 +155,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 @@ -110,7 +164,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 diff --git a/docs/yarn.lock b/docs/yarn.lock index eeff7b223..fcdc047ed 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -2664,10 +2664,10 @@ color@^3.0.0, color@^3.1.2: color-convert "^1.9.1" color-string "^1.5.2" -colorette@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" - integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colorette@^1.2.1, colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" @@ -6527,6 +6527,11 @@ nanoid@^2.0.3: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== +nanoid@^3.1.22: + version "3.1.23" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" + integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== + nanomatch@^1.2.13, nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -7640,6 +7645,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.2 source-map "^0.6.1" supports-color "^6.1.0" +postcss@^8.2.10: + version "8.2.10" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b" + integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw== + dependencies: + colorette "^1.2.2" + nanoid "^3.1.22" + source-map "^0.6.1" + prepend-http@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" diff --git a/frontend/fonts b/frontend/fonts deleted file mode 120000 index 3af17ecb9..000000000 --- a/frontend/fonts +++ /dev/null @@ -1 +0,0 @@ -./node_modules/tabler-ui/dist/assets/fonts \ No newline at end of file diff --git a/frontend/fonts/feather b/frontend/fonts/feather new file mode 120000 index 000000000..440203ba2 --- /dev/null +++ b/frontend/fonts/feather @@ -0,0 +1 @@ +../node_modules/tabler-ui/dist/assets/fonts/feather \ No newline at end of file diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff new file mode 100644 index 000000000..96d8768ea Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2 b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2 new file mode 100644 index 000000000..e97a22181 Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2 differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff new file mode 100644 index 000000000..0829caef1 Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2 b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2 new file mode 100644 index 000000000..7c901cd84 Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2 differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff new file mode 100644 index 000000000..99652481a Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2 b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2 new file mode 100644 index 000000000..343e5ba8d Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2 differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff new file mode 100644 index 000000000..92c3260ef Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff differ diff --git a/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2 b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2 new file mode 100644 index 000000000..d552543be Binary files /dev/null and b/frontend/fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2 differ diff --git a/frontend/html/partials/header.ejs b/frontend/html/partials/header.ejs index 3e1f657c0..b8d883311 100644 --- a/frontend/html/partials/header.ejs +++ b/frontend/html/partials/header.ejs @@ -20,7 +20,6 @@ - diff --git a/frontend/js/app/nginx/access/list/item.ejs b/frontend/js/app/nginx/access/list/item.ejs index 23f2ede29..2ee37a50a 100644 --- a/frontend/js/app/nginx/access/list/item.ejs +++ b/frontend/js/app/nginx/access/list/item.ejs @@ -32,6 +32,7 @@
+ <%- i18n('audit-log', 'access-list') %> #<%- id %> <%- i18n('str', 'edit') %>
<%- i18n('str', 'delete') %> diff --git a/frontend/js/app/nginx/certificates/form.js b/frontend/js/app/nginx/certificates/form.js index ff488cb79..d5d3acd38 100644 --- a/frontend/js/app/nginx/certificates/form.js +++ b/frontend/js/app/nginx/certificates/form.js @@ -4,11 +4,20 @@ const App = require('../../main'); const CertificateModel = require('../../../models/certificate'); const template = require('./form.ejs'); const i18n = require('../../i18n'); -const dns_providers = require('../../../../../global/certbot-dns-plugins'); +const dns_providers = sortProvidersAlphabetically(require('../../../../../global/certbot-dns-plugins')); require('jquery-serializejson'); require('selectize'); +function sortProvidersAlphabetically(obj) { + return Object.entries(obj) + .sort((a,b) => a[1].display_name.toLowerCase() > b[1].display_name.toLowerCase()) + .reduce((result, entry) => { + result[entry[0]] = entry[1]; + return result; + }, {}); +} + module.exports = Mn.View.extend({ template: template, className: 'modal-dialog', diff --git a/frontend/js/app/nginx/certificates/list/item.ejs b/frontend/js/app/nginx/certificates/list/item.ejs index 9b1cb603a..87930dceb 100644 --- a/frontend/js/app/nginx/certificates/list/item.ejs +++ b/frontend/js/app/nginx/certificates/list/item.ejs @@ -38,6 +38,7 @@
+ <%- i18n('audit-log', 'certificate') %> #<%- id %> <% if (provider === 'letsencrypt') { %> <%- i18n('certificates', 'force-renew') %>
diff --git a/frontend/js/app/nginx/dead/list/item.ejs b/frontend/js/app/nginx/dead/list/item.ejs index f975da589..d447bd1e3 100644 --- a/frontend/js/app/nginx/dead/list/item.ejs +++ b/frontend/js/app/nginx/dead/list/item.ejs @@ -43,6 +43,7 @@
+ <%- i18n('audit-log', 'dead-host') %> #<%- id %> <%- i18n('str', 'edit') %> <%- i18n('str', enabled ? 'disable' : 'enable') %>
diff --git a/frontend/js/app/nginx/proxy/list/item.ejs b/frontend/js/app/nginx/proxy/list/item.ejs index d90ace4c0..a59368048 100644 --- a/frontend/js/app/nginx/proxy/list/item.ejs +++ b/frontend/js/app/nginx/proxy/list/item.ejs @@ -49,6 +49,7 @@
+ <%- i18n('audit-log', 'proxy-host') %> #<%- id %> <%- i18n('str', 'edit') %> <%- i18n('str', enabled ? 'disable' : 'enable') %>
diff --git a/frontend/js/app/nginx/redirection/list/item.ejs b/frontend/js/app/nginx/redirection/list/item.ejs index dfff29d75..4f25d973e 100644 --- a/frontend/js/app/nginx/redirection/list/item.ejs +++ b/frontend/js/app/nginx/redirection/list/item.ejs @@ -52,6 +52,7 @@
+ <%- i18n('audit-log', 'redirection-host') %> #<%- id %> <%- i18n('str', 'edit') %> <%- i18n('str', enabled ? 'disable' : 'enable') %>
diff --git a/frontend/js/app/nginx/stream/list/item.ejs b/frontend/js/app/nginx/stream/list/item.ejs index 2c1e07593..2c04667fb 100644 --- a/frontend/js/app/nginx/stream/list/item.ejs +++ b/frontend/js/app/nginx/stream/list/item.ejs @@ -42,6 +42,7 @@
+ <%- i18n('audit-log', 'stream') %> #<%- id %> <%- i18n('str', 'edit') %> <%- i18n('str', enabled ? 'disable' : 'enable') %>
diff --git a/frontend/js/app/user/password.ejs b/frontend/js/app/user/password.ejs index 7dd497d15..a45cc7ed7 100644 --- a/frontend/js/app/user/password.ejs +++ b/frontend/js/app/user/password.ejs @@ -4,6 +4,7 @@
+
<% if (isSelf()) { %>
@@ -15,7 +16,7 @@
-
+
diff --git a/frontend/js/app/user/password.js b/frontend/js/app/user/password.js index 06c572619..840307502 100644 --- a/frontend/js/app/user/password.js +++ b/frontend/js/app/user/password.js @@ -9,21 +9,23 @@ module.exports = Mn.View.extend({ className: 'modal-dialog', ui: { - form: 'form', - buttons: '.modal-footer button', - cancel: 'button.cancel', - save: 'button.save', - error: '.secret-error' + form: 'form', + buttons: '.modal-footer button', + cancel: 'button.cancel', + save: 'button.save', + newSecretError: '.new-secret-error', + generalError: '#error-info', }, events: { 'click @ui.save': function (e) { e.preventDefault(); - this.ui.error.hide(); + this.ui.newSecretError.hide(); + this.ui.generalError.hide(); let form = this.ui.form.serializeJSON(); if (form.new_password1 !== form.new_password2) { - this.ui.error.text('Passwords do not match!').show(); + this.ui.newSecretError.text('Passwords do not match!').show(); return; } @@ -40,7 +42,11 @@ module.exports = Mn.View.extend({ App.Controller.showUsers(); }) .catch(err => { - this.ui.error.text(err.message).show(); + // Change error message to make it a little clearer + if (err.message === 'Invalid password') { + err.message = 'Current password is invalid'; + } + this.ui.generalError.text(err.message).show(); this.ui.buttons.prop('disabled', false).removeClass('btn-disabled'); }); } @@ -54,5 +60,10 @@ module.exports = Mn.View.extend({ return { isSelf: this.isSelf.bind(this) }; - } + }, + + onRender: function () { + this.ui.newSecretError.hide(); + this.ui.generalError.hide(); + }, }); diff --git a/frontend/js/app/users/list/item.ejs b/frontend/js/app/users/list/item.ejs index e8699b59e..fab5585bc 100644 --- a/frontend/js/app/users/list/item.ejs +++ b/frontend/js/app/users/list/item.ejs @@ -29,6 +29,7 @@
+ <%- i18n('audit-log', 'user') %> #<%- id %> <%- i18n('users', 'edit-details') %> <%- i18n('users', 'edit-permissions') %> <%- i18n('users', 'change-password') %> diff --git a/frontend/js/i18n/messages.json b/frontend/js/i18n/messages.json index d1f79b3cb..2fb4a04f4 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.\nNPM 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", diff --git a/frontend/scss/custom.scss b/frontend/scss/custom.scss index 8e417f86d..4037dcf6c 100644 --- a/frontend/scss/custom.scss +++ b/frontend/scss/custom.scss @@ -12,6 +12,10 @@ a:hover { color: darken($primary-color, 10%); } +.dropdown-header { + padding-left: 1rem; +} + .dropdown-item.active, .dropdown-item:active { background-color: $primary-color; } diff --git a/frontend/scss/fonts.scss b/frontend/scss/fonts.scss new file mode 100644 index 000000000..f0ec1b739 --- /dev/null +++ b/frontend/scss/fonts.scss @@ -0,0 +1,39 @@ +/* source-sans-pro-regular - latin-ext_latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + src: local(''), + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* source-sans-pro-italic - latin-ext_latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: italic; + font-weight: 400; + src: local(''), + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* source-sans-pro-700italic - latin-ext_latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: italic; + font-weight: 700; + src: local(''), + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} + +/* source-sans-pro-700 - latin-ext_latin */ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 700; + src: local(''), + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../fonts/source-sans-pro/source-sans-pro-v14-latin-ext_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} diff --git a/frontend/scss/styles.scss b/frontend/scss/styles.scss index 16b329c7e..527330972 100644 --- a/frontend/scss/styles.scss +++ b/frontend/scss/styles.scss @@ -1,5 +1,6 @@ @import "~tabler-ui/dist/assets/css/dashboard"; @import "tabler-extra"; +@import "fonts"; @import "selectize"; @import "custom"; diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js index 8b911dc1b..df0f1c14c 100644 --- a/frontend/webpack.config.js +++ b/frontend/webpack.config.js @@ -90,7 +90,19 @@ module.exports = { } } ] - } + }, + { + test: /source-sans-pro.*\.(woff(2)?)(\?v=\d+\.\d+\.\d+)?$/, + use: [ + { + loader: 'file-loader', + options: { + name: '[name].[ext]', + outputPath: 'assets/' + } + } + ] + } ] }, plugins: [ diff --git a/frontend/yarn.lock b/frontend/yarn.lock index bea9e874b..ad36144d3 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" diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index 85592b3c1..b8ad8d178 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -43,7 +43,7 @@ certbot_dns_aliyun:dns_aliyun_access_key_secret = 1234567890abcdef1234567890abcd azure: { display_name: 'Azure', package_name: 'certbot-dns-azure', - package_version: '1.1.0', + package_version: '1.2.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. @@ -126,9 +126,9 @@ certbot_dns_cpanel:cpanel_password = hunter2`, duckdns: { display_name: 'DuckDNS', package_name: 'certbot-dns-duckdns', - package_version: '0.5', + package_version: '0.6', dependencies: '', - credentials: 'dns_duckdns_token=', + credentials: 'dns_duckdns_token=your-duckdns-token', full_plugin_name: 'dns-duckdns', }, //####################################################// @@ -181,6 +181,15 @@ certbot_dns_dnspod:dns_dnspod_api_token = "DNSPOD-API-TOKEN"`, full_plugin_name: 'certbot-dns-dnspod:dns-dnspod', }, //####################################################// + dynu: { + display_name: 'Dynu', + package_name: 'certbot-dns-dynu', + package_version: '0.0.1', + dependencies: '', + credentials: 'certbot_dns_dynu:dns_dynu_auth_token = YOUR_DYNU_AUTH_TOKEN', + full_plugin_name: 'certbot-dns-dynu:dns-dynu', + }, + //####################################################// eurodns: { display_name: 'EuroDNS', package_name: 'certbot-dns-eurodns', @@ -201,6 +210,16 @@ dns_eurodns_endpoint = https://rest-api.eurodns.com/user-api-gateway/proxy`, full_plugin_name: 'certbot-plugin-gandi:dns', }, //####################################################// + godaddy: { + display_name: 'GoDaddy', + package_name: 'certbot-dns-godaddy', + package_version: '0.2.0', + dependencies: '', + credentials: `dns_godaddy_secret = 0123456789abcdef0123456789abcdef01234567 +dns_godaddy_key = abcdef0123456789abcdef01234567abcdef0123`, + full_plugin_name: 'dns-godaddy', + }, + //####################################################// google: { display_name: 'Google', package_name: 'certbot-dns-google', @@ -316,6 +335,16 @@ dns_ovh_consumer_key = MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw`, full_plugin_name: 'dns-ovh', }, //####################################################// + porkbun: { + display_name: 'Porkbun', + package_name: 'certbot-dns-porkbun', + package_version: '0.2', + dependencies: '', + credentials: `dns_porkbun_key=your-porkbun-api-key +dns_porkbun_secret=your-porkbun-api-secret`, + full_plugin_name: 'dns-porkbun', + }, + //####################################################// powerdns: { display_name: 'PowerDNS', package_name: 'certbot-dns-powerdns',