diff --git a/helm/Chart.yaml b/helm/Chart.yaml index aecafddd..02cac5b0 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -4,5 +4,5 @@ description: A Helm chart for deploying Synctv application with PostgreSQL State type: application -appVersion: 0.9.5 -version: 0.9.5 +appVersion: 0.9.6 +version: 0.9.6 diff --git a/internal/settings/var.go b/internal/settings/var.go index 2da33558..3a5a7840 100644 --- a/internal/settings/var.go +++ b/internal/settings/var.go @@ -92,3 +92,9 @@ var HOST = NewStringSetting( return err }), ) + +var P2PZone = NewStringSetting( + "p2p_zone", + "hk", + model.SettingGroupServer, +) diff --git a/server/handlers/public.go b/server/handlers/public.go index 865506a3..c5af793f 100644 --- a/server/handlers/public.go +++ b/server/handlers/public.go @@ -20,6 +20,7 @@ type publicSettings struct { EmailWhitelistEnabled bool `json:"emailWhitelistEnabled"` Oauth2DisableSignup bool `json:"oauth2DisableSignup"` GuestEnable bool `json:"guestEnable"` + P2PZone string `json:"p2pZone"` } func Settings(ctx *gin.Context) { @@ -43,6 +44,7 @@ func Settings(ctx *gin.Context) { Oauth2DisableSignup: settings.DisableUserSignup.Get() || len(oauth2SignupEnabled) == 0, GuestEnable: settings.EnableGuest.Get(), + P2PZone: settings.P2PZone.Get(), }, )) } diff --git a/synctv-web b/synctv-web index 5a684180..8a5d749e 160000 --- a/synctv-web +++ b/synctv-web @@ -1 +1 @@ -Subproject commit 5a684180da162e8d2504c3034bc535c6e7d2ee06 +Subproject commit 8a5d749ef8edd4bd17981b88e104c74a8f32d3bb