mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2026-04-25 01:15:51 +03:00
[PR #4505] PROXY Protocol support (rd 2) #3888
Labels
No labels
awaiting feedback
bug
cannot reproduce
dns provider request
duplicate
enhancement
enhancement
enhancement
good first issue
help wanted
invalid
need more info
no certbot plugin available
product-support
pull-request
question
stale
troll
upstream issue
v2
v2
v2
v3
wontfix
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/nginx-proxy-manager-NginxProxyManager#3888
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/NginxProxyManager/nginx-proxy-manager/pull/4505
Author: @adrum
Created: 4/25/2025
Status: 🔄 Open
Base:
develop← Head:develop📝 Commits (10+)
b687548Merge pull request 'Fork syncthing' (#1) from GitHub/nginx-proxy-manager:develop into developecb2752PROXY Protocol support implementation9eabfb9Merge branch 'NginxProxyManager:develop' into develop6c5f198Merge branch 'develop' into develop54864f4Merge branch 'NginxProxyManager:develop' into developcc6d249Merge branch 'NginxProxyManager:develop' into develop1eb6a57Merge branch 'NginxProxyManager:develop' into developfe8f853Merge branch 'develop' of ssh://github.com/NginxProxyManager/nginx-proxy-manager into develop5e73361bump buildcf4965cUpdate proxy_host.js📊 Changes
15 files changed (+130 additions, -7 deletions)
View changed files
📝
backend/internal/nginx.js(+2 -1)➕
backend/migrations/20220209144645_proxy_protocol.js(+35 -0)📝
backend/models/proxy_host.js(+1 -0)📝
backend/schema/components/proxy-host-object.json(+12 -0)📝
backend/schema/paths/nginx/proxy-hosts/get.json(+2 -0)📝
backend/schema/paths/nginx/proxy-hosts/hostID/get.json(+2 -0)📝
backend/schema/paths/nginx/proxy-hosts/hostID/put.json(+8 -0)📝
backend/schema/paths/nginx/proxy-hosts/post.json(+8 -0)📝
backend/templates/_listen.conf(+18 -2)➕
backend/templates/_proxy_protocol.conf(+6 -0)📝
backend/templates/proxy_host.conf(+1 -0)📝
frontend/js/app/nginx/proxy/form.ejs(+16 -1)📝
frontend/js/app/nginx/proxy/form.js(+13 -1)📝
frontend/js/i18n/messages.json(+4 -2)📝
frontend/js/models/proxy-host.js(+2 -0)📄 Description
This is essentially https://github.com/NginxProxyManager/nginx-proxy-manager/pull/1882 with the merge conflicts resolved.
I first tried submitting a PR to the source branch, but it's not yet been merged. https://github.com/SBado/nginx-proxy-manager/pull/1
I thought I might have better luck here 😄
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.