From 8f3f09c4198d4abe1f185af93c175af22e0e0f09 Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Sun, 4 Aug 2024 23:57:59 -0400 Subject: [PATCH 01/18] Add Nginx Proxy Manager --- nginx-proxy-manager/docker-compose.yml | 22 ++++++++++++ nginx-proxy-manager/umbrel-app.yml | 49 ++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 nginx-proxy-manager/docker-compose.yml create mode 100644 nginx-proxy-manager/umbrel-app.yml diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/docker-compose.yml new file mode 100644 index 0000000000..2395aa80c8 --- /dev/null +++ b/nginx-proxy-manager/docker-compose.yml @@ -0,0 +1,22 @@ +version: "3.7" + +services: + app_proxy: + environment: + APP_HOST: nginx-proxy-manager_web_1 + APP_PORT: 81 + web: + image: jc21/nginx-proxy-manager:2.11.3@sha256:5bd2aae54ac0b6f4ef6777143ab736baf5366807894a4c7fca7bfa2fbaf1489c + hostname: nginx-proxy-manager_web_1 + restart: on-failure + ports: + - 443:443 + volumes: + - ${APP_DATA_DIR}/data:/data + - ${APP_DATA_DIR}/letsencrypt:/etc/letsencrypt + environment: + PUID: 1000 + PGID: 1000 + extra_hosts: + - "host.docker.internal:host-gateway" + - "${APP_DOMAIN}:host-gateway" diff --git a/nginx-proxy-manager/umbrel-app.yml b/nginx-proxy-manager/umbrel-app.yml new file mode 100644 index 0000000000..b7b47f12e9 --- /dev/null +++ b/nginx-proxy-manager/umbrel-app.yml @@ -0,0 +1,49 @@ +manifestVersion: 1 +id: nginx-proxy-manager +name: Nginx Proxy Manager +tagline: Expose your services easily and securely +icon: https://nginxproxymanager.com/logo.svg +category: networking +version: "2.11.3" +port: 81 +description: >- + Expose your services easily and securely + + + Features: + + - Beautiful and Secure Admin Interface based on Tabler: https://tabler.github.io/ + + - Easily create forwarding domains, redirections, streams and 404 hosts without knowing anything about Nginx + + - Free SSL using Let's Encrypt or provide your own custom SSL certificates + + - Access Lists and basic HTTP Authentication for your hosts + + - Advanced Nginx configuration available for super users + + - User management, permissions and audit log + + + ⚠️ Please take care while exposing apps to the internet. + + ⚠️ Note: Since Port 80 is used my Umbrel itself, it will not be handled by Nginx Proxy Manager. Hence do not to forward Port 80 from your router. Only forward Port 443. ⚠️ + +developer: Jamie Curnow (jc21.com) +website: https://nginxproxymanager.com/ +submitter: sahilph +submission: https://github.com/sahilph/sahil-umbrel-apps/tree/sahilph-nginx-proxy-manager +repo: https://github.com/sahilph/sahil-umbrel-apps/ +support: https://github.com/sahilph/sahil-umbrel-apps//issues +gallery: + - https://nginxproxymanager.com/screenshots/login.png + - https://nginxproxymanager.com/screenshots/dashboard.png + - https://nginxproxymanager.com/screenshots/proxy-hosts.png + - https://nginxproxymanager.com/screenshots/proxy-hosts-add.png +releaseNotes: >- + Nginx Proxy Manager Updated to [2.11.3] + More Info: https://github.com/NginxProxyManager/nginx-proxy-manager/releases/tag/v2.11.3. +dependencies: [] +path: "" +defaultUsername: "admin@example.com" +defaultPassword: "changeme" From 1a82ef84cd7a1462677d23dba374965bca779daf Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Mon, 5 Aug 2024 00:11:52 -0400 Subject: [PATCH 02/18] Fix Submission URL And remove release notes --- nginx-proxy-manager/umbrel-app.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nginx-proxy-manager/umbrel-app.yml b/nginx-proxy-manager/umbrel-app.yml index b7b47f12e9..2bbe07847f 100644 --- a/nginx-proxy-manager/umbrel-app.yml +++ b/nginx-proxy-manager/umbrel-app.yml @@ -32,7 +32,7 @@ description: >- developer: Jamie Curnow (jc21.com) website: https://nginxproxymanager.com/ submitter: sahilph -submission: https://github.com/sahilph/sahil-umbrel-apps/tree/sahilph-nginx-proxy-manager +submission: https://github.com/getumbrel/umbrel-apps/pull/1296 repo: https://github.com/sahilph/sahil-umbrel-apps/ support: https://github.com/sahilph/sahil-umbrel-apps//issues gallery: @@ -40,9 +40,6 @@ gallery: - https://nginxproxymanager.com/screenshots/dashboard.png - https://nginxproxymanager.com/screenshots/proxy-hosts.png - https://nginxproxymanager.com/screenshots/proxy-hosts-add.png -releaseNotes: >- - Nginx Proxy Manager Updated to [2.11.3] - More Info: https://github.com/NginxProxyManager/nginx-proxy-manager/releases/tag/v2.11.3. dependencies: [] path: "" defaultUsername: "admin@example.com" From f5dde51a2d6eb9adb31cddc785fffabc76afb478 Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Mon, 5 Aug 2024 00:14:01 -0400 Subject: [PATCH 03/18] Add Empty Release Notes --- nginx-proxy-manager/umbrel-app.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx-proxy-manager/umbrel-app.yml b/nginx-proxy-manager/umbrel-app.yml index 2bbe07847f..bd02eee04a 100644 --- a/nginx-proxy-manager/umbrel-app.yml +++ b/nginx-proxy-manager/umbrel-app.yml @@ -40,6 +40,7 @@ gallery: - https://nginxproxymanager.com/screenshots/dashboard.png - https://nginxproxymanager.com/screenshots/proxy-hosts.png - https://nginxproxymanager.com/screenshots/proxy-hosts-add.png +releaseNotes: "" dependencies: [] path: "" defaultUsername: "admin@example.com" From 99c66d9bd6a25ec74ddb77d3f913a58c16569901 Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Mon, 5 Aug 2024 00:16:16 -0400 Subject: [PATCH 04/18] Create .gitkeep --- nginx-proxy-manager/data/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 nginx-proxy-manager/data/.gitkeep diff --git a/nginx-proxy-manager/data/.gitkeep b/nginx-proxy-manager/data/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 From ef41ed959622b6f1294022f6dace197f419d0b12 Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Mon, 5 Aug 2024 00:18:27 -0400 Subject: [PATCH 05/18] Create .gitkeep --- nginx-proxy-manager/letsencrypt/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 nginx-proxy-manager/letsencrypt/.gitkeep diff --git a/nginx-proxy-manager/letsencrypt/.gitkeep b/nginx-proxy-manager/letsencrypt/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 From f3aae36f0677e7f8900724fa5095f03a52145ea5 Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Fri, 20 Sep 2024 00:24:49 -0400 Subject: [PATCH 06/18] Apply suggestions from code review Co-authored-by: Nathan Fretz --- nginx-proxy-manager/docker-compose.yml | 7 ++++--- nginx-proxy-manager/umbrel-app.yml | 13 ++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/docker-compose.yml index 2395aa80c8..06d7ecc9df 100644 --- a/nginx-proxy-manager/docker-compose.yml +++ b/nginx-proxy-manager/docker-compose.yml @@ -10,10 +10,11 @@ services: hostname: nginx-proxy-manager_web_1 restart: on-failure ports: - - 443:443 + - 40080:80 + - 40443:443 volumes: - - ${APP_DATA_DIR}/data:/data - - ${APP_DATA_DIR}/letsencrypt:/etc/letsencrypt + - ${APP_DATA_DIR}/data/npm-data:/data + - ${APP_DATA_DIR}/data/letsencrypt:/etc/letsencrypt environment: PUID: 1000 PGID: 1000 diff --git a/nginx-proxy-manager/umbrel-app.yml b/nginx-proxy-manager/umbrel-app.yml index bd02eee04a..f4f8b1eb99 100644 --- a/nginx-proxy-manager/umbrel-app.yml +++ b/nginx-proxy-manager/umbrel-app.yml @@ -29,17 +29,16 @@ description: >- ⚠️ Note: Since Port 80 is used my Umbrel itself, it will not be handled by Nginx Proxy Manager. Hence do not to forward Port 80 from your router. Only forward Port 443. ⚠️ -developer: Jamie Curnow (jc21.com) +developer: Jamie Curnow website: https://nginxproxymanager.com/ submitter: sahilph submission: https://github.com/getumbrel/umbrel-apps/pull/1296 -repo: https://github.com/sahilph/sahil-umbrel-apps/ -support: https://github.com/sahilph/sahil-umbrel-apps//issues +repo: https://github.com/NginxProxyManager/nginx-proxy-manager +support: https://github.com/NginxProxyManager/nginx-proxy-manager/issues gallery: - - https://nginxproxymanager.com/screenshots/login.png - - https://nginxproxymanager.com/screenshots/dashboard.png - - https://nginxproxymanager.com/screenshots/proxy-hosts.png - - https://nginxproxymanager.com/screenshots/proxy-hosts-add.png + - 1.jpg + - 2.jpg + - 3.jpg releaseNotes: "" dependencies: [] path: "" From 7c19784205ab9c850af4eb072b513ebb4aa56b95 Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Fri, 20 Sep 2024 00:41:12 -0400 Subject: [PATCH 07/18] Apply remaining suggestions from code review --- nginx-proxy-manager/{ => data}/letsencrypt/.gitkeep | 0 nginx-proxy-manager/umbrel-app.yml | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename nginx-proxy-manager/{ => data}/letsencrypt/.gitkeep (100%) diff --git a/nginx-proxy-manager/letsencrypt/.gitkeep b/nginx-proxy-manager/data/letsencrypt/.gitkeep similarity index 100% rename from nginx-proxy-manager/letsencrypt/.gitkeep rename to nginx-proxy-manager/data/letsencrypt/.gitkeep diff --git a/nginx-proxy-manager/umbrel-app.yml b/nginx-proxy-manager/umbrel-app.yml index f4f8b1eb99..139f7784a7 100644 --- a/nginx-proxy-manager/umbrel-app.yml +++ b/nginx-proxy-manager/umbrel-app.yml @@ -2,7 +2,6 @@ manifestVersion: 1 id: nginx-proxy-manager name: Nginx Proxy Manager tagline: Expose your services easily and securely -icon: https://nginxproxymanager.com/logo.svg category: networking version: "2.11.3" port: 81 @@ -27,7 +26,7 @@ description: >- ⚠️ Please take care while exposing apps to the internet. - ⚠️ Note: Since Port 80 is used my Umbrel itself, it will not be handled by Nginx Proxy Manager. Hence do not to forward Port 80 from your router. Only forward Port 443. ⚠️ + ⚠️ Note: This app listen on ports 40080 and 40443. In order to make the apps proxied by NPM accessible from internet, users need to port forward 80 to 40080 and 443 to 40443 on their router. ⚠️ developer: Jamie Curnow website: https://nginxproxymanager.com/ From 1e55e83b182b096d9717496a505157162be4ae1d Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Fri, 20 Sep 2024 00:43:53 -0400 Subject: [PATCH 08/18] Create .gitkeep --- nginx-proxy-manager/data/npm-data/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 nginx-proxy-manager/data/npm-data/.gitkeep diff --git a/nginx-proxy-manager/data/npm-data/.gitkeep b/nginx-proxy-manager/data/npm-data/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 From eacd84e6432221240cf7670da47a19b5c4dabd00 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Tue, 24 Sep 2024 11:26:45 +1000 Subject: [PATCH 09/18] Remove .gitkeep from data dir --- nginx-proxy-manager/data/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 nginx-proxy-manager/data/.gitkeep diff --git a/nginx-proxy-manager/data/.gitkeep b/nginx-proxy-manager/data/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 From 0f22250b5006cce0528affff69ad72493e3b97e8 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Tue, 24 Sep 2024 12:32:19 +1000 Subject: [PATCH 10/18] Tweak app description --- nginx-proxy-manager/umbrel-app.yml | 35 ++++++++++++++---------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/nginx-proxy-manager/umbrel-app.yml b/nginx-proxy-manager/umbrel-app.yml index 139f7784a7..ee7c60ceb7 100644 --- a/nginx-proxy-manager/umbrel-app.yml +++ b/nginx-proxy-manager/umbrel-app.yml @@ -6,28 +6,25 @@ category: networking version: "2.11.3" port: 81 description: >- - Expose your services easily and securely + Expose your apps to the internet easily and securely. + + + ⚠️ Be cautious when exposing apps to the public internet. Ensure they have proper security, such as login protection, and avoid exposing sensitive apps without adequate safeguards. + + 🔧 Nginx Proxy Manager uses port 40080 for HTTP (unsecured) traffic and port 40443 for HTTPS (secured) traffic. + To make your apps accessible from the public internet, you will need to set up port forwarding on your router. + Forward external port 80 (HTTP) to internal port 40080 and external port 443 (HTTPS) to internal port 40443. - Features: - - - Beautiful and Secure Admin Interface based on Tabler: https://tabler.github.io/ - - - Easily create forwarding domains, redirections, streams and 404 hosts without knowing anything about Nginx - - - Free SSL using Let's Encrypt or provide your own custom SSL certificates - - - Access Lists and basic HTTP Authentication for your hosts - - - Advanced Nginx configuration available for super users - - - User management, permissions and audit log - - - ⚠️ Please take care while exposing apps to the internet. - - ⚠️ Note: This app listen on ports 40080 and 40443. In order to make the apps proxied by NPM accessible from internet, users need to port forward 80 to 40080 and 443 to 40443 on their router. ⚠️ + + 🔍 Features: + - Beautiful and Secure Admin Interface based on Tabler + - Easily create forwarding domains, redirections, streams and 404 hosts without knowing anything about Nginx + - Free SSL using Let's Encrypt or provide your own custom SSL certificates + - Access Lists and basic HTTP Authentication for your hosts + - Advanced Nginx configuration available for super users + - User management, permissions and audit log developer: Jamie Curnow website: https://nginxproxymanager.com/ submitter: sahilph From 70706665be2663397ae9b0feac324efe00290fbb Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Mon, 23 Sep 2024 23:59:15 -0400 Subject: [PATCH 11/18] Add my full name --- nginx-proxy-manager/umbrel-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-proxy-manager/umbrel-app.yml b/nginx-proxy-manager/umbrel-app.yml index ee7c60ceb7..c364412675 100644 --- a/nginx-proxy-manager/umbrel-app.yml +++ b/nginx-proxy-manager/umbrel-app.yml @@ -27,7 +27,7 @@ description: >- - User management, permissions and audit log developer: Jamie Curnow website: https://nginxproxymanager.com/ -submitter: sahilph +submitter: Sahil Phule submission: https://github.com/getumbrel/umbrel-apps/pull/1296 repo: https://github.com/NginxProxyManager/nginx-proxy-manager support: https://github.com/NginxProxyManager/nginx-proxy-manager/issues From 66c560cb6633cd06185fdc242db748e95b998b1e Mon Sep 17 00:00:00 2001 From: nmfretz Date: Tue, 24 Sep 2024 15:33:00 +1000 Subject: [PATCH 12/18] tweak compose formatting --- nginx-proxy-manager/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/docker-compose.yml index 06d7ecc9df..29383c181e 100644 --- a/nginx-proxy-manager/docker-compose.yml +++ b/nginx-proxy-manager/docker-compose.yml @@ -5,6 +5,7 @@ services: environment: APP_HOST: nginx-proxy-manager_web_1 APP_PORT: 81 + web: image: jc21/nginx-proxy-manager:2.11.3@sha256:5bd2aae54ac0b6f4ef6777143ab736baf5366807894a4c7fca7bfa2fbaf1489c hostname: nginx-proxy-manager_web_1 From d13a423a65afbe3f056bd120ca75a95ef6ad860f Mon Sep 17 00:00:00 2001 From: nmfretz Date: Tue, 24 Sep 2024 15:33:19 +1000 Subject: [PATCH 13/18] Update UI port to a free port --- nginx-proxy-manager/umbrel-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-proxy-manager/umbrel-app.yml b/nginx-proxy-manager/umbrel-app.yml index c364412675..3225c88fc7 100644 --- a/nginx-proxy-manager/umbrel-app.yml +++ b/nginx-proxy-manager/umbrel-app.yml @@ -4,7 +4,7 @@ name: Nginx Proxy Manager tagline: Expose your services easily and securely category: networking version: "2.11.3" -port: 81 +port: 4498 description: >- Expose your apps to the internet easily and securely. From b6e4ef72ee90d647a9a19cfdb594076c7e3dfa5b Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Tue, 24 Sep 2024 16:29:41 -0400 Subject: [PATCH 14/18] Add docker-host workaround --- nginx-proxy-manager/docker-compose.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/docker-compose.yml index 29383c181e..05051addd9 100644 --- a/nginx-proxy-manager/docker-compose.yml +++ b/nginx-proxy-manager/docker-compose.yml @@ -19,6 +19,9 @@ services: environment: PUID: 1000 PGID: 1000 - extra_hosts: - - "host.docker.internal:host-gateway" - - "${APP_DOMAIN}:host-gateway" + + docker-host: + image: qoomon/docker-host@sha256:ec9d214d7fa88932e9186ca2f4419d44661376929931248525b08e7fa9e270f7 + hostname: umbrel.local + cap_add: [ 'NET_ADMIN', 'NET_RAW' ] + restart: on-failure From d468c0dc339d811e1f1d63328f4132dedd587ea7 Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Tue, 24 Sep 2024 16:33:16 -0400 Subject: [PATCH 15/18] Add tag --- nginx-proxy-manager/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/docker-compose.yml index 05051addd9..7f8b1153c4 100644 --- a/nginx-proxy-manager/docker-compose.yml +++ b/nginx-proxy-manager/docker-compose.yml @@ -21,7 +21,7 @@ services: PGID: 1000 docker-host: - image: qoomon/docker-host@sha256:ec9d214d7fa88932e9186ca2f4419d44661376929931248525b08e7fa9e270f7 + image: qoomon/docker-host:3@sha256:ec9d214d7fa88932e9186ca2f4419d44661376929931248525b08e7fa9e270f7 hostname: umbrel.local cap_add: [ 'NET_ADMIN', 'NET_RAW' ] restart: on-failure From da0368a2277e7d5a91b3f4436d27d56350dccbae Mon Sep 17 00:00:00 2001 From: Sahil Phule Date: Thu, 26 Sep 2024 13:27:09 -0400 Subject: [PATCH 16/18] Add more exact version tag. --- nginx-proxy-manager/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/docker-compose.yml index 7f8b1153c4..9007300da9 100644 --- a/nginx-proxy-manager/docker-compose.yml +++ b/nginx-proxy-manager/docker-compose.yml @@ -21,7 +21,7 @@ services: PGID: 1000 docker-host: - image: qoomon/docker-host:3@sha256:ec9d214d7fa88932e9186ca2f4419d44661376929931248525b08e7fa9e270f7 + image: qoomon/docker-host:3.3.1@sha256:ec9d214d7fa88932e9186ca2f4419d44661376929931248525b08e7fa9e270f7 hostname: umbrel.local cap_add: [ 'NET_ADMIN', 'NET_RAW' ] restart: on-failure From 9151cf1ae786b65a4f07abb58a6beadc0e8ad759 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Thu, 3 Oct 2024 22:23:38 +1000 Subject: [PATCH 17/18] change hostname env var to dynamic DEVICE_DOMAIN_NAME --- nginx-proxy-manager/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/docker-compose.yml index 9007300da9..b3d686b3fd 100644 --- a/nginx-proxy-manager/docker-compose.yml +++ b/nginx-proxy-manager/docker-compose.yml @@ -22,6 +22,6 @@ services: docker-host: image: qoomon/docker-host:3.3.1@sha256:ec9d214d7fa88932e9186ca2f4419d44661376929931248525b08e7fa9e270f7 - hostname: umbrel.local + hostname: $DEVICE_DOMAIN_NAME cap_add: [ 'NET_ADMIN', 'NET_RAW' ] restart: on-failure From 28972f82b05a7b5b9539825812d152125d114790 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Thu, 3 Oct 2024 22:24:21 +1000 Subject: [PATCH 18/18] reformat cap_add directive --- nginx-proxy-manager/docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/docker-compose.yml index b3d686b3fd..fc54efb7a4 100644 --- a/nginx-proxy-manager/docker-compose.yml +++ b/nginx-proxy-manager/docker-compose.yml @@ -23,5 +23,7 @@ services: docker-host: image: qoomon/docker-host:3.3.1@sha256:ec9d214d7fa88932e9186ca2f4419d44661376929931248525b08e7fa9e270f7 hostname: $DEVICE_DOMAIN_NAME - cap_add: [ 'NET_ADMIN', 'NET_RAW' ] + cap_add: + - NET_ADMIN + - NET_RAW restart: on-failure