diff --git a/pkg/webserver/LICENSE b/pkg/webserver/LICENSE deleted file mode 100644 index b4a1cc19..00000000 --- a/pkg/webserver/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2025 AcePanel - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/pkg/webserver/nginx/data.go b/pkg/webserver/nginx/data.go index 1fc71732..1f62a2e2 100644 --- a/pkg/webserver/nginx/data.go +++ b/pkg/webserver/nginx/data.go @@ -19,12 +19,10 @@ const DefaultConf = `include /opt/ace/sites/default/config/shared/*.conf; server { listen 80; server_name localhost; - index index.php index.html; root /opt/ace/sites/default/public; + index index.php index.html; # error page error_page 404 /404.html; - # custom configs - include /opt/ace/sites/default/config/site/*.conf; # browser cache location ~ .*\.(bmp|jpg|jpeg|png|gif|svg|ico|tiff|webp|avif|heif|heic|jxl)$ { expires 30d; @@ -40,6 +38,8 @@ server { location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.env) { return 404; } + # custom configs + include /opt/ace/sites/default/config/site/*.conf; access_log /opt/ace/sites/default/log/access.log; error_log /opt/ace/sites/default/log/error.log; }