From 96637867e529289fd95d2d5346d7c819930b37e9 Mon Sep 17 00:00:00 2001
From: Alex Peterson <alexpeterson91@gmail.com>
Date: Mon, 6 Dec 2021 17:49:23 -0600
Subject: [PATCH 1/5] Fix typos and grammar

Fixed a few misspelled words, and added several "the"s to make the sentences flow better in English, and fixed some other minor grammar.


Note:
i did not fix this sentence yet since I'm not certain what it means exactly but again i think it just needs a "the" somewhere to make it totally clear will update when I've spoken to someone to clarify.
`But please note, for every subdomain certificate is requested since it uses HTTP challenges which cannot be used for issuing wildcard certificates.`
---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 557e219..fba35c9 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,23 @@
 # HTTPS
 
-This is a fork of a original [https-portal](https://github.com/SteveLTN/https-portal), with additional features intended to use in [DAppNode](https://github.com/dappnode/DAppNode) as one of the core packages. All of its existing features should remain functional.
+This is a fork of an original [https-portal](https://github.com/SteveLTN/https-portal), with additional features intended to be used in [DAppNode](https://github.com/dappnode/DAppNode) as one of the core packages. All of its existing features should remain functional.
 
 <p align="center"><a href="#"><img width="150" title="DAPPMANAGER" src='https-portal-avatar.png' /></a></p>
 
 ## Configurable forwarding
 
-API was added through which containers proxied through portal can be dinamically chosen. By default server listens at port `5000` for `GET` methods `add` and `remove` both of which have `to` and `from` querry parameters i.e.
+API was added through which containers proxied through portal can be dynamically chosen. By default the server listens at port `5000` for `GET` methods `add` and `remove` both of which have `to` and `from` query parameters i.e.
 
 ```
 GET /add?from=<chosen-subodomain>&to=<internal-resource>
 GET /remove?from=<chosen-subodomain>&to=<internal-resource>
 ```
 
-Where `chosen-subdomain` is chosen external endpoint for forwarding and `internal-resource` is either IP or domain that resolves on the internal network.
+Where `chosen-subdomain` is the chosen external endpoint for forwarding and `internal-resource` is either the IP or domain that resolves on the internal network.
 
 ## DAppNode certificates
 
-When using DAppNode dyndns service, https-portal uses DAppNode certificate service to get wildcard certificates for the DAppNode dyndns domains which are provided for free. In this mode, following environment variables have to be set:
+When using the DAppNode dyndns service, https-portal uses DAppNode's certificate service to get wildcard certificates for the DAppNode dyndns domains which are provided for free. In this mode, the following environment variables have to be set:
 | Name | Value | Description |
 | -------------- | --------------------- | ----------------------------- |
 | CERTAPI_URL | TBD | URL of remote signing service |
@@ -26,8 +26,8 @@ This mode can only be used within DAppNode as a package.
 
 ## Running DAppNode on your own domain
 
-It is even possible to run DAppNode on your own domain. Your domain and all of its subdomains should resolve to the pubilc IP of the DAppNode. But please note, for every subdomain certificate is requested since it uses HTTP chalenges which cannot be used for issuing wildcard certificates.
-In this mode, following environment variables have to be set:
+It is even possible to run DAppNode on your own domain. Your domain and all of its subdomains should resolve to the pubilc IP of the DAppNode. But please note, for every subdomain certificate is requested since it uses HTTP challenges which cannot be used for issuing wildcard certificates.
+In this mode, the following environment variables have to be set:
 | Name | Value | Description |
 | -------------- | --------------------- | ------------------ |
 | PUBLIC_DOMAIN | | Your domain |

From bcd84fecf20decb291efa3897f6d511aba3be21b Mon Sep 17 00:00:00 2001
From: Alex Peterson <alexpeterson91@gmail.com>
Date: Mon, 6 Dec 2021 18:08:06 -0600
Subject: [PATCH 2/5] Add link to github issue

Moved license up like most other dappnode_package.JSONs
and added link to this repo's Issues to fix the broken report link in the adminUI
---
 dappnode_package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dappnode_package.json b/dappnode_package.json
index badc139..5db7f22 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -4,6 +4,7 @@
   "description": "HTTPS portal for DAppNode",
   "type": "dncore",
   "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",
+  "license": "GLP-3.0",
   "contributors": ["Shardlabs <info@shardlabs.io> (https://shardlabs.io/)"],
   "architectures": ["linux/amd64", "linux/arm64"],
   "categories": ["Developer tools"],
@@ -15,5 +16,7 @@
     "type": "git",
     "url": "https://github.com/dappnode/DNP_HTTPS"
   },
-  "license": "GLP-3.0"
+  "bugs": {
+    "url": "https://github.com/dappnode/DNP_HTTPS/issues"
+  }
 }

From 9ab5bc4f3b0bdcef3574642269c51fbd80ca648b Mon Sep 17 00:00:00 2001
From: Alex Peterson <alexpeterson91@gmail.com>
Date: Mon, 6 Dec 2021 18:17:27 -0600
Subject: [PATCH 3/5] changed title of HTTPS logo to "HTTPS"

Logo for the HTTPS logo was titled as "DAPPMANAGER" so i changed it to "HTTPS"
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fba35c9..a67aea8 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This is a fork of an original [https-portal](https://github.com/SteveLTN/https-portal), with additional features intended to be used in [DAppNode](https://github.com/dappnode/DAppNode) as one of the core packages. All of its existing features should remain functional.
 
-<p align="center"><a href="#"><img width="150" title="DAPPMANAGER" src='https-portal-avatar.png' /></a></p>
+<p align="center"><a href="#"><img width="150" title="HTTPS" src='https-portal-avatar.png' /></a></p>
 
 ## Configurable forwarding
 

From b2138e496f0f47e2a1c76e440e9aeb8291162fcf Mon Sep 17 00:00:00 2001
From: Alex Peterson <alexpeterson91@gmail.com>
Date: Tue, 7 Dec 2021 14:09:54 -0600
Subject: [PATCH 4/5] Bump Ruby version

Bumped ruby version per @3alpha to allow CI to build successfully
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 877ec2b..489fe48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7.4-alpine AS ruby-builder
+FROM ruby:2.7.5-alpine AS ruby-builder
 
 RUN apk add --update build-base 
 
@@ -50,7 +50,7 @@ RUN export ARCH=$(echo $TARGETPLATFORM | cut -d'/' -f2 | sed 's/arm64/aarch64/')
     rm /etc/nginx/conf.d/default.conf && \
     apk add --update \
     # From original image
-    python2 ruby=2.7.4-r0 iproute2 apache2-utils logrotate openssl \
+    python2 ruby=2.7.5-r0 iproute2 apache2-utils logrotate openssl \
     # For Typescript app
     nodejs \
     && \

From ec131e4c4b6dc0094689b564e068c05dc30bef04 Mon Sep 17 00:00:00 2001
From: Alex Peterson <alexpeterson91@gmail.com>
Date: Tue, 7 Dec 2021 14:19:43 -0600
Subject: [PATCH 5/5] Fixed last sentence grammar

added an "a" to make the sentence flow properly and make sense
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a67aea8..abe4656 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ This mode can only be used within DAppNode as a package.
 
 ## Running DAppNode on your own domain
 
-It is even possible to run DAppNode on your own domain. Your domain and all of its subdomains should resolve to the pubilc IP of the DAppNode. But please note, for every subdomain certificate is requested since it uses HTTP challenges which cannot be used for issuing wildcard certificates.
+It is even possible to run DAppNode on your own domain. Your domain and all of its subdomains should resolve to the pubilc IP of the DAppNode. But please note, for every subdomain a certificate is requested, since it uses HTTP challenges which cannot be used for issuing wildcard certificates.
 In this mode, the following environment variables have to be set:
 | Name | Value | Description |
 | -------------- | --------------------- | ------------------ |