mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat(maintainance): add acme-challenge location handling

Browse source
This commit is contained in:
Jacky 2025-04-12 11:15:56 +00:00
parent 0dd928ec83
commit d379afa95c
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.devcontainer/init-nginx.sh
View file

@ -3,4 +3,7 @@ if [ "$(ls -A /etc/nginx)" = "" ]; then
echo "Initialing Nginx config dir" echo "Initialing Nginx config dir"
cp -rp /etc/nginx.orig/* /etc/nginx/ cp -rp /etc/nginx.orig/* /etc/nginx/
echo "Initialed Nginx config dir" echo "Initialed Nginx config dir"
fi fi
# start nginx
nginx -g "daemon off;"

24
internal/site/maintenance.go
View file

@ -12,11 +12,12 @@ import (
"github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/0xJacky/Nginx-UI/internal/nginx"
"github.com/0xJacky/Nginx-UI/internal/notification" "github.com/0xJacky/Nginx-UI/internal/notification"
"github.com/0xJacky/Nginx-UI/model" "github.com/0xJacky/Nginx-UI/model"
"github.com/0xJacky/Nginx-UI/settings"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
"github.com/tufanbarisyildirim/gonginx/config" "github.com/tufanbarisyildirim/gonginx/config"
"github.com/tufanbarisyildirim/gonginx/parser" "github.com/tufanbarisyildirim/gonginx/parser"
"github.com/uozi-tech/cosy/logger" "github.com/uozi-tech/cosy/logger"
"github.com/uozi-tech/cosy/settings" cSettings "github.com/uozi-tech/cosy/settings"
) )
const MaintenanceSuffix = "_nginx_ui_maintenance" const MaintenanceSuffix = "_nginx_ui_maintenance"
@ -152,9 +153,9 @@ func DisableMaintenance(name string) (err error) {
// createMaintenanceConfig creates a maintenance configuration based on the original config // createMaintenanceConfig creates a maintenance configuration based on the original config
func createMaintenanceConfig(conf *config.Config) string { func createMaintenanceConfig(conf *config.Config) string {
nginxUIPort := settings.ServerSettings.Port nginxUIPort := cSettings.ServerSettings.Port
schema := "http" schema := "http"
if settings.ServerSettings.EnableHTTPS { if cSettings.ServerSettings.EnableHTTPS {
schema = "https" schema = "https"
} }
@ -218,13 +219,28 @@ func createMaintenanceConfig(conf *config.Config) string {
ngxServer.Directives = append(ngxServer.Directives, ngxDirective) ngxServer.Directives = append(ngxServer.Directives, ngxDirective)
} }
// Add acme-challenge location
acmeChallengeLocation := &nginx.NgxLocation{
Path: "^~ /.well-known/acme-challenge",
}
// Build location content using string builder
var locationContent strings.Builder
locationContent.WriteString("proxy_set_header Host $host;\n")
locationContent.WriteString("proxy_set_header X-Real-IP $remote_addr;\n")
locationContent.WriteString("proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n")
locationContent.WriteString(fmt.Sprintf("proxy_pass http://127.0.0.1:%s;\n", settings.CertSettings.HTTPChallengePort))
acmeChallengeLocation.Content = locationContent.String()
ngxServer.Locations = append(ngxServer.Locations, acmeChallengeLocation)
// Add maintenance mode location // Add maintenance mode location
location := &nginx.NgxLocation{ location := &nginx.NgxLocation{
Path: "~ .*", Path: "~ .*",
} }
locationContent.Reset()
// Build location content using string builder // Build location content using string builder
var locationContent strings.Builder
locationContent.WriteString("proxy_set_header Host $host;\n") locationContent.WriteString("proxy_set_header Host $host;\n")
locationContent.WriteString("proxy_set_header X-Real-IP $remote_addr;\n") locationContent.WriteString("proxy_set_header X-Real-IP $remote_addr;\n")
locationContent.WriteString("proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n") locationContent.WriteString("proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n")