mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-25 15:09:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2437 from owncloud/update-deployment-example-configs

Browse Source 
Update theme path in ocis-wopi, ocis-hello examples, drone config and default flagset docs
This commit is contained in:
Willy Kloucek
2021-10-12 17:23:00 +02:00
committed by GitHub
parent 90246d776d 987261f646
commit 60eb304359
5 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deployments/examples/ocis_hello/config/ocis/web-config.dist.json
View File

@@ -1,6 +1,6 @@
{
"server": "https://ocis.owncloud.test",
"theme": "owncloud",
"theme": "https://ocis.owncloud.test/themes/owncloud/theme.json",
"version": "0.1.0",
"openIdConnect": {
"metadata_url": "https://ocis.owncloud.test/.well-known/openid-configuration",

2
tests/config/drone/ocis-config.json
View File

@@ -1,6 +1,6 @@
{
"server": "https://ocis-server:9200",
"theme": "owncloud",
"theme": "https://ocis-server:9200/themes/owncloud/theme.json",
"version": "0.1.0",
"openIdConnect": {
"metadata_url": "https://ocis-server:9200/.well-known/openid-configuration",

2
web/pkg/config/config.go
View File

@@ -43,6 +43,8 @@ type Asset struct {
// WebConfig defines the available web configuration for a dynamically rendered config.json.
type WebConfig struct {
Server string `json:"server,omitempty"`
ThemeServer string `json:"omit"` // only used to build Theme
ThemePath string `json:"omit"` // only used to build Theme
Theme string `json:"theme,omitempty"`
Version string `json:"version,omitempty"` // TODO what is version used for?
OpenIDConnect OIDC `json:"openIdConnect,omitempty"`

17
web/pkg/flagset/flagset.go
View File

@@ -164,16 +164,23 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
&cli.StringFlag{
Name: "web-config-server",
Value: flags.OverrideDefaultString(cfg.Web.Config.Server, "https://localhost:9200"),
Usage: "Server URL",
Usage: "Configuration server URL",
EnvVars: []string{"WEB_UI_CONFIG_SERVER", "OCIS_URL"}, // WEB_UI_CONFIG_SERVER takes precedence over OCIS_URL
Destination: &cfg.Web.Config.Server,
},
&cli.StringFlag{
Name: "web-theme-server",
Value: flags.OverrideDefaultString(cfg.Web.Config.ThemeServer, "https://localhost:9200"),
Usage: "Theme server URL",
EnvVars: []string{"WEB_UI_THEME_SERVER", "OCIS_URL"}, // WEB_UI_THEME_SERVER takes precedence over OCIS_URL
Destination: &cfg.Web.Config.ThemeServer,
},
&cli.StringFlag{
Name: "web-config-theme",
Value: flags.OverrideDefaultString(cfg.Web.Config.Theme, "owncloud"),
Usage: "Theme",
EnvVars: []string{"WEB_UI_CONFIG_THEME"},
Destination: &cfg.Web.Config.Theme,
Value: flags.OverrideDefaultString(cfg.Web.Config.ThemePath, "/themes/owncloud/theme.json"),
Usage: "Theme path on the theme server",
EnvVars: []string{"WEB_UI_THEME_PATH"},
Destination: &cfg.Web.Config.ThemePath,
},
&cli.StringFlag{
Name: "web-config-version",

8
web/pkg/service/v0/service.go
View File

@@ -4,6 +4,7 @@ import (
"encoding/json"
"io/ioutil"
"net/http"
"net/url"
"os"
"strings"
"time"
@@ -69,6 +70,13 @@ func (p Web) getPayload() (payload []byte, err error) {
p.config.Web.Config.Options["hideSearchBar"] = true
}
// build theme url
if themeServer, err := url.Parse(p.config.Web.Config.ThemeServer); err == nil {
p.config.Web.Config.Theme = themeServer.String() + p.config.Web.Config.ThemePath
} else {
p.config.Web.Config.Theme = p.config.Web.Config.ThemePath
}
if p.config.Web.Config.ExternalApps == nil {
p.config.Web.Config.ExternalApps = []config.ExternalApp{
{