mirror of
https://github.com/fatedier/frp.git
synced 2026-05-15 08:05:49 -06:00
[PR #2982] [MERGED] Server Dashboard SSL Support #4670
Labels
No labels
In Progress
WIP
WaitingForInfo
bug
doc
duplicate
easy
enhancement
future
help wanted
invalid
lifecycle/stale
need-issue-template
need-usage-help
no plan
proposal
pull-request
question
todo
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: github-starred/frp#4670
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/fatedier/frp/pull/2982
Author: @EMREOYUN
Created: 6/16/2022
Status: ✅ Merged
Merged: 6/27/2022
Merged by: @fatedier
Base:
dev← Head:patch-1📝 Commits (10+)
310fc14Server Dashboard SSL Support6e1f43eSSL Config Updatea76f4c5SSL Config Definitionb02c6caDashboardTLSMode Config Update947c043CMD Dashboard TLS Configaf6fcecDashboard TLS Mode Definition Fix8d8c42aREADME update with HTTPS Dashboarda51a5daTLS Config Error changed807516aHTTPS Handling and TLS Certificate Checkingb5ae3d8Unnecessary configs removed & Read and Write Timeouts added📊 Changes
5 files changed (+93 additions, -28 deletions)
View changed files
📝
README.md(+15 -0)📝
cmd/frps/root.go(+34 -25)📝
conf/frps_full.ini(+5 -0)📝
pkg/config/server.go(+28 -0)📝
server/dashboard.go(+11 -3)📄 Description
Added a simple if-else statement that checks TLSOnly mode enabled. If enabled, serves the dashboard in HTTPS mode. Otherwise, serves the dashboard in HTTP mode.
If TLSCertFile and TLSKeyFile are not used in config but TLSOnly is enabled, the HTTPS dashboard does not loads.
Tested on Debian Linux and Windows Server 2012.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.