ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-08-16 13:56:52 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

merging changes

Browse Source
This commit is contained in:
Nick Craig
2022-03-10 16:14:07 -05:00
parent 30c9a1fbbd
commit 6368c39ef7
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/templates/proxy_host.conf
View File

@@ -64,7 +64,8 @@ proxy_http_version 1.1;
{% endif %} {% endif %}
{% endif %} {% endif %}
#do the proxy!
proxy_pass $forward_scheme://$server:$port$request_uri;
} }
{% endif %} {% endif %}

14
docker/Dockerfile
View File

@@ -3,7 +3,7 @@
# This file assumes that the frontend has been built using ./scripts/frontend-build # This file assumes that the frontend has been built using ./scripts/frontend-build
FROM owenscorning/aws-nginx-full:certbot-node FROM 413067109875.dkr.ecr.us-east-1.amazonaws.com/owenscorning/aws-nginx-full:certbot-node
ARG TARGETPLATFORM ARG TARGETPLATFORM
ARG BUILD_VERSION ARG BUILD_VERSION
@@ -18,12 +18,12 @@ ENV SUPPRESS_NO_CONFIG_WARNING=1 \
NPM_BUILD_COMMIT="${BUILD_COMMIT}" \ NPM_BUILD_COMMIT="${BUILD_COMMIT}" \
NPM_BUILD_DATE="${BUILD_DATE}" NPM_BUILD_DATE="${BUILD_DATE}"
RUN yum makecache \ RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
&& yum install -y \ && apt-get update \
jq logrotate \ && apt-get upgrade -y \
\ && apt-get install -y --no-install-recommends jq logrotate \
&& yum clean all \ && apt-get clean \
&& rm -rf /var/cache/* /var/log/* /tmp/* && rm -rf /var/lib/apt/lists/*
# s6 overlay # s6 overlay
COPY scripts/install-s6 /tmp/install-s6 COPY scripts/install-s6 /tmp/install-s6

2
docker/rootfs/etc/nginx/conf.d/include/proxy.conf
View File

@@ -3,5 +3,5 @@ proxy_set_header X-Forwarded-Scheme $scheme;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_pass $forward_scheme://$server:$port$request_uri;

1
frontend/fonts/feather
View File

@@ -1 +0,0 @@
../node_modules/tabler-ui/dist/assets/fonts/feather

1
frontend/images
View File

@@ -1 +0,0 @@
./node_modules/tabler-ui/dist/assets/images

3
frontend/js/i18n/messages.json
View File

@@ -133,7 +133,8 @@
"allow-websocket-upgrade": "Websockets Support", "allow-websocket-upgrade": "Websockets Support",
"ignore-invalid-upstream-ssl": "Ignore Invalid SSL", "ignore-invalid-upstream-ssl": "Ignore Invalid SSL",
"custom-forward-host-help": "Add a path for sub-folder forwarding.\nExample: 203.0.113.25/path", "custom-forward-host-help": "Add a path for sub-folder forwarding.\nExample: 203.0.113.25/path",
"search": "Search Host…" "search": "Search Host…",
"forward-proxy-header": "Forward Hostname"
}, },
"redirection-hosts": { "redirection-hosts": {
"title": "Redirection Hosts", "title": "Redirection Hosts",

2
frontend/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "nginx-proxy-manager", "name": "nginx-proxy-manager",
"version": "0.0.0", "version": "2.9.16",
"description": "A beautiful interface for creating Nginx endpoints", "description": "A beautiful interface for creating Nginx endpoints",
"main": "js/index.js", "main": "js/index.js",
"devDependencies": { "devDependencies": {