diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.go | 12 | ||||
| -rw-r--r-- | config/config.local.yaml | 5 | ||||
| -rw-r--r-- | config/config.prod.yaml | 5 | ||||
| -rw-r--r-- | config/config.stage.yaml | 6 |
4 files changed, 20 insertions, 8 deletions
diff --git a/config/config.go b/config/config.go index 0b1570a..8ab1bfc 100644 --- a/config/config.go +++ b/config/config.go @@ -22,7 +22,7 @@ type Config struct { CanonicalEndpoint string `json:"CanonicalEndpoint" yaml:"canonicalEndpoint" validate:"required"` Meta MetaConfig `json:"Meta" yaml:"meta"` PhotoStorage PhotoStorageConfig `json:"PhotoStorage" yaml:"photoStorage"` - StaticStorage PhotoTypeConfig `json:"StaticStorage" yaml:"staticStorage"` + StaticStorage StaticStorageConfig `json:"StaticStorage" yaml:"staticStorage" validate:"required"` AllowOrigins []string `json:"AllowOrigins" yaml:"allowOrigins"` } @@ -261,6 +261,16 @@ type HomePageGifsConfig struct { Indexes []string `json:"Indexes" yaml:"indexes"` } +type StaticStorageConfig struct { + BaseUrl string `json:"BaseUrl" yaml:"baseUrl" validate:"url,required"` + Map MapStorageConfig `json:"Map" yaml:"map" validate:"required"` +} + +type MapStorageConfig struct { + BaseUrl string `json:"BaseUrl" yaml:"baseUrl" validate:"url,required"` + PMTiles string `json:"PMTiles" yaml:"pmTiles" validate:"required"` +} + func LoadConfig(path string, config *Config) error { fileBytes, err := os.ReadFile(path) if err != nil { diff --git a/config/config.local.yaml b/config/config.local.yaml index 80eb8f7..7fe612b 100644 --- a/config/config.local.yaml +++ b/config/config.local.yaml @@ -74,8 +74,9 @@ photoStorage: indexes: ["1", "2", "3"] staticStorage: baseUrl: https://cdn.saya.uz/static -mapStorage: - baseUrl: https://cdn.saya.uz/map + map: + baseUrl: https://cdn.saya.uz/map + pmTiles: global.pmtiles allowOrigins: - https://storage.yandexcloud.kz - https://cdn.saya.uz diff --git a/config/config.prod.yaml b/config/config.prod.yaml index ad4864a..5df5422 100644 --- a/config/config.prod.yaml +++ b/config/config.prod.yaml @@ -77,8 +77,9 @@ photoStorage: indexes: ["1", "2", "3"] staticStorage: baseUrl: https://cdn.saya.uz/static -mapStorage: - baseUrl: https://cdn.saya.uz/map + map: + baseUrl: https://cdn.saya.uz/map + pmTiles: global.pmtiles allowOrigins: - https://storage.yandexcloud.kz - https://cdn.saya.uz diff --git a/config/config.stage.yaml b/config/config.stage.yaml index 4b46c6c..f593fef 100644 --- a/config/config.stage.yaml +++ b/config/config.stage.yaml @@ -74,9 +74,9 @@ photoStorage: indexes: ["1", "2", "3"] staticStorage: baseUrl: https://cdn.saya.uz/static -mapStorage: - baseUrl: https://cdn.saya.uz/map + map: + baseUrl: https://cdn.saya.uz/map + pmTiles: global.pmtiles allowOrigins: - https://storage.yandexcloud.kz - https://cdn.saya.uz - |