Merge branch 'main' of https://github.com/Websoft9/websoft9 into main

This commit is contained in:
qiaofeng1227 2024-12-11 15:50:19 +08:00
commit db594448ea
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# modify time: 202412111427, you can modify here to trigger Docker Build action
# modify time: 202412111455, you can modify here to trigger Docker Build action
# from Dockerfile: https://github.com/NginxProxyManager/nginx-proxy-manager/blob/develop/docker/Dockerfile
# from image: https://hub.docker.com/r/jc21/nginx-proxy-manager
@ -11,7 +11,7 @@ COPY README.md /data/nginx/README.md
RUN mkdir /data/nginx/custom
RUN mkdir -p /etc/websoft9
COPY ./config/http.conf /data/nginx/custom/http.conf
COPY ./config/landing /etc/websoft9
COPY ./config/landing/ /etc/websoft9/landing
COPY ./config/initproxy.conf /etc/websoft9/initproxy.conf
COPY ./init_nginx.sh /app/init_nginx.sh
RUN chmod +x /app/init_nginx.sh

View File

@ -17,9 +17,9 @@ server {
}
location = / {
root /ect/websoft9/landing;
root /etc/websoft9/landing;
try_files /index.html =404;
add_header Content-Type text/plain;
add_header Content-Type text/html;
}
location / {