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

Websoft9 · Dec 11, 2024 · db59444 · db59444
2 parents 7664e19 + 62e1815
commit db59444
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
@@ -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

diff --git a/docker/proxy/config/initproxy.conf b/docker/proxy/config/initproxy.conf
@@ -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 / {