Diffstat (limited to 'config')
| -rw-r--r-- | config/config.go | 102 | ||||
| -rw-r--r-- | config/config.local.yaml | 83 | ||||
| -rw-r--r-- | config/config.prod.yaml | 91 | ||||
| -rw-r--r-- | config/config.stage.yaml | 84 |
4 files changed, 113 insertions, 247 deletions
diff --git a/config/config.go b/config/config.go index 9185e6a..536a333 100644 --- a/config/config.go +++ b/config/config.go @@ -12,7 +12,6 @@ import ( type Config struct { LogLevel slog.Level `json:"LogLevel" yaml:"logLevel" validate:"required"` - Endpoint EndpointConfig `json:"Endpoint" yaml:"endpoint" validate:"required"` BlogPages BlogPagesConfig `json:"BlogPages" yaml:"blogPages" validate:"required"` FactGiver FactGiverConfig `json:"FactGiver" yaml:"factGiver" validate:"required"` LocalePath string `json:"LocalePath" yaml:"localePath" validate:"required,filepath"` @@ -20,96 +19,18 @@ type Config struct { Auth AuthConfig `json:"Auth" yaml:"auth" validate:"required"` Mail MailConfig `json:"Mail" yaml:"mail" validate:"required"` CanonicalEndpoint string `json:"CanonicalEndpoint" yaml:"canonicalEndpoint" validate:"required"` - Meta []MetaConfig `json:"Meta" yaml:"meta"` + Meta MetaConfig `json:"Meta" yaml:"meta"` PhotoStorage PhotoStorageConfig `json:"PhotoStorage" yaml:"photoStorage"` - StaticStorage StaticStorageConfig `json:"StaticStorage" yaml:"staticStorage" validate:"required"` + StaticStorage PhotoTypeConfig `json:"StaticStorage" yaml:"staticStorage"` AllowOrigins []string `json:"AllowOrigins" yaml:"allowOrigins"` } -type EndpointConfig struct { - Type string `json:"Type" yaml:"type" validate:"required,oneof=http unix"` - Config any `json:"Config" yaml:"config" validate:"required"` -} - -func (ec *EndpointConfig) UnmarshalJSON(data []byte) error { - var tmp struct { - Type string `json:"Type"` - Config json.RawMessage `json:"Config"` - } - - if err := json.Unmarshal(data, &tmp); err != nil { - return err - } - - ec.Type = tmp.Type - - switch tmp.Type { - case "http": - var httpConfig HttpConfig - if err := json.Unmarshal(tmp.Config, &httpConfig); err != nil { - return fmt.Errorf("unmarshal HttpConfig: %w", err) - } - ec.Config = &httpConfig - case "unix": - var unixConfig UnixConfig - if err := json.Unmarshal(tmp.Config, &unixConfig); err != nil { - return fmt.Errorf("unmarshal UnixConfig: %w", err) - } - ec.Config = &unixConfig - default: - return fmt.Errorf("unsupported storage type: %s", tmp.Type) - } - - return nil -} - -func (ec *EndpointConfig) UnmarshalYAML(value *yaml.Node) error { - var tmp struct { - Type string `yaml:"type"` - Config yaml.Node `yaml:"config"` - } - - if err := value.Decode(&tmp); err != nil { - return err - } - - ec.Type = tmp.Type - - switch tmp.Type { - case "http": - var httpConfig HttpConfig - if err := tmp.Config.Decode(&httpConfig); err != nil { - return fmt.Errorf("unmarshal HttpConfig: %w", err) - } - ec.Config = &httpConfig - case "unix": - var unixConfig UnixConfig - if err := tmp.Config.Decode(&unixConfig); err != nil { - return fmt.Errorf("unmarshal UnixConfig: %w", err) - } - ec.Config = &unixConfig - default: - return fmt.Errorf("unsupported storage type: %s", tmp.Type) - } - - return nil -} - -type HttpConfig struct { - ListenOn string `json:"ListenOn" yaml:"listenOn" validate:"required"` -} - -type UnixConfig struct { - Path string `json:"Path" yaml:"path" validate:"required"` - Chmod string `json:"Chmod" yaml:"chmod" validate:"oneof=0600 0660 0666"` -} - type BlogPagesConfig struct { Storage StorageConfig `json:"Storage" yaml:"storage" validate:"required"` } type StorageConfig struct { - Type string `json:"Type" yaml:"type" validate:"required,oneof=b2 s3"` + Type string `json:"type" yaml:"type,oneof=b2 s3"` Config any `json:"Config" yaml:"config" validate:"required"` } @@ -237,8 +158,7 @@ type TriggerConfig struct { } type MetaConfig struct { - Name string `json:"Name" yaml:"name"` - Value string `json:"Value" yaml:"value"` + GoogleSiteVerification string `json:"GoogleSiteVerification" yaml:"googleSiteVerification"` } type PhotoStorageConfig struct { @@ -261,16 +181,6 @@ 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 { @@ -292,10 +202,6 @@ func InitConfig(path string) (*Config, error) { return nil, err } - if config.Endpoint.Type == "unix" && config.Endpoint.Config.(*UnixConfig).Chmod == "" { - config.Endpoint.Config.(*UnixConfig).Chmod = "0660" - } - validate := validator.New(validator.WithRequiredStructEnabled()) if err := validate.Struct(config); err != nil { return nil, err diff --git a/config/config.local.yaml b/config/config.local.yaml index fefe2e7..fb79e97 100644 --- a/config/config.local.yaml +++ b/config/config.local.yaml @@ -1,81 +1,70 @@ logLevel: debug -endpoint: - type: http - config: - listenOn: ":3000" blogPages: storage: - type: s3 + type: b2 config: - bucketName: sayauz-pages - region: kz1 - prefix: "stage-" - endpoint: "https://storage.yandexcloud.kz" - usePathStyle: true - accessKeyID: "${S3_ACCESS_KEY_ID}" - secretAccessKey: "${S3_SECRET_ACCESS_KEY}" + bucketName: sayana-pages + region: eu-central-003 + prefix: 'stage-' + keyID: '${B2_KEY_ID}' + applicationKey: '${B2_APPLICATION_KEY}' factGiver: storage: - type: s3 + type: b2 config: - bucketName: sayauz-pages - region: kz1 - prefix: "" - endpoint: "https://storage.yandexcloud.kz" - usePathStyle: true - accessKeyID: "${S3_ACCESS_KEY_ID}" - secretAccessKey: "${S3_SECRET_ACCESS_KEY}" - factsFileName: "facts-*.txt" + bucketName: sayana-pages + region: eu-central-003 + prefix: '' + keyID: '${B2_KEY_ID}' + applicationKey: '${B2_APPLICATION_KEY}' + factsFileName: 'facts-*.txt' localePath: ./locale/ availableLanguages: - name: ru alt: Русский - flag: https://cdn.saya.uz/stats/flags/ru.svg + flag: https://storage.yandexcloud.kz/sayauz-static/flags/ru.svg locFile: localization.ru.yaml - name: en alt: English - flag: https://cdn.saya.uz/stats/flags/gb.svg + flag: https://storage.yandexcloud.kz/sayauz-static/flags/gb.svg locFile: localization.en.yaml auth: db: type: sqlite3 config: # dsn: 'file:/tmp/auth.db?cache=shared&mode=rwc&_journal_mode=WAL' - dsn: "file:/tmp/auth.db?cache=private&mode=rwc&_locking_mode=EXCLUSIVE&_mutex=no&_auto_vacuum=2&_journal_mode=WAL" - salt: "123" + dsn: 'file:/tmp/auth.db?cache=private&mode=rwc&_locking_mode=EXCLUSIVE&_mutex=no&_auto_vacuum=2&_journal_mode=WAL' + salt: '123' mail: - clientHost: "127.0.0.1:3000" - mailHost: "${MAIL_HOST}" - publicName: "LOCAL.SAYA.UZ" - mailAddress: "${MAIL_ADDRESS}" - username: "${MAIL_USERNAME}" - password: "${MAIL_PASSWORD}" - salt: "${MAIL_SALT}" + clientHost: '127.0.0.1:3000' + mailHost: '${MAIL_HOST}' + publicName: 'LOCAL.SAYA.TODAY' + mailAddress: '${MAIL_ADDRESS}' + username: '${MAIL_USERNAME}' + password: '${MAIL_PASSWORD}' + salt: '${MAIL_SALT}' trigger: onNewPost: "* * * * *" -canonicalEndpoint: "http://127.0.0.1:3000" +canonicalEndpoint: 'http://127.0.0.1:3000' photoStorage: full: - baseUrl: https://cdn.saya.uz/photos/jpeg-full/%s + baseUrl: https://storage.yandexcloud.kz/sayauz-photos/%s webp: - baseUrl: https://cdn.saya.uz/photos/webp-full/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp/%s.webp thumbnail1600p: - baseUrl: https://cdn.saya.uz/photos/webp-1600p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp1600/%s.webp thumbnail1200p: - baseUrl: https://cdn.saya.uz/photos/webp-1200p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp1200/%s.webp thumbnail800p: - baseUrl: https://cdn.saya.uz/photos/webp-800p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp800/%s.webp thumbnail560p: - baseUrl: https://cdn.saya.uz/photos/webp-560p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp560/%s.webp thumbnail320p: - baseUrl: https://cdn.saya.uz/photos/webp-320p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp320/%s.webp homePageGifs: - baseUrl: https://cdn.saya.uz/stats/home-page-gifs/otter-%s.gif - indexes: ["1", "2", "3"] + baseUrl: https://storage.yandexcloud.kz/sayauz-static/home-page-gifs/otter-%s.gif + indexes: ['1', '2', '3'] staticStorage: - baseUrl: https://cdn.saya.uz/stats - map: - baseUrl: https://cdn.saya.uz/map - pmTiles: global.pmtiles + baseUrl: https://storage.yandexcloud.kz/sayauz-static allowOrigins: - - https://cdn.saya.uz + - https://storage.yandexcloud.kz diff --git a/config/config.prod.yaml b/config/config.prod.yaml index 6ec00d8..868e242 100644 --- a/config/config.prod.yaml +++ b/config/config.prod.yaml @@ -1,88 +1,71 @@ logLevel: info -endpoint: - type: unix - config: - path: "/etc/sayauz/prod.socket" - chmod: '0666' blogPages: storage: - type: s3 + type: b2 config: - bucketName: sayauz-pages - region: kz1 - prefix: "prod-" - endpoint: "https://storage.yandexcloud.kz" - usePathStyle: true - accessKeyID: "${S3_ACCESS_KEY_ID}" - secretAccessKey: "${S3_SECRET_ACCESS_KEY}" + bucketName: sayana-pages + region: eu-central-003 + prefix: 'prod-' + keyID: '${B2_KEY_ID}' + applicationKey: '${B2_APPLICATION_KEY}' factGiver: storage: - type: s3 + type: b2 config: - bucketName: sayauz-pages - region: kz1 - prefix: "" - endpoint: "https://storage.yandexcloud.kz" - usePathStyle: true - accessKeyID: "${S3_ACCESS_KEY_ID}" - secretAccessKey: "${S3_SECRET_ACCESS_KEY}" - factsFileName: "facts-*.txt" + bucketName: sayana-pages + region: eu-central-003 + prefix: '' + keyID: '${B2_KEY_ID}' + applicationKey: '${B2_APPLICATION_KEY}' + factsFileName: 'facts-*.txt' localePath: ./locale/ availableLanguages: - name: ru alt: Русский - flag: https://cdn.saya.uz/stats/flags/ru.svg + flag: https://storage.yandexcloud.kz/sayauz-static/flags/ru.svg locFile: localization.ru.yaml - name: en alt: English - flag: https://cdn.saya.uz/stats/flags/gb.svg + flag: https://storage.yandexcloud.kz/sayauz-static/flags/gb.svg locFile: localization.en.yaml auth: db: type: sqlite3 config: - dsn: "file:/data/auth.db?cache=private&mode=rwc&_locking_mode=EXCLUSIVE&_mutex=no&_auto_vacuum=2&_journal_mode=WAL" - salt: "${AUTH_SALT}" + dsn: 'file:/data/auth.db?cache=private&mode=rwc&_locking_mode=EXCLUSIVE&_mutex=no&_auto_vacuum=2&_journal_mode=WAL' + salt: '${AUTH_SALT}' mail: - clientHost: "${FQDN}" - mailHost: "${MAIL_HOST}" - publicName: "SAYA.UZ" - mailAddress: "${MAIL_ADDRESS}" - username: "${MAIL_USERNAME}" - password: "${MAIL_PASSWORD}" - salt: "${MAIL_SALT}" + clientHost: '${FQDN}' + mailHost: '${MAIL_HOST}' + publicName: 'SAYA.TODAY' + mailAddress: '${MAIL_ADDRESS}' + username: '${MAIL_USERNAME}' + password: '${MAIL_PASSWORD}' + salt: '${MAIL_SALT}' trigger: onNewPost: "0/5 * * * *" -canonicalEndpoint: "https://${FQDN}" +canonicalEndpoint: 'https://${FQDN}' meta: - - name: google-site-verification - value: "${GOOGLE_SITE_VERIFICATION}" - - name: yandex-verification - value: "${YANDEX_VERIFICATION}" - - name: msvalidate.01 - value: "${BING_VERIFICATION}" + googleSiteVerification: '${GOOGLE_SITE_VERIFICATION}' photoStorage: full: - baseUrl: https://cdn.saya.uz/photos/jpeg-full/%s + baseUrl: https://storage.yandexcloud.kz/sayauz-photos/%s webp: - baseUrl: https://cdn.saya.uz/photos/webp-full/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp/%s.webp thumbnail1600p: - baseUrl: https://cdn.saya.uz/photos/webp-1600p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp1600/%s.webp thumbnail1200p: - baseUrl: https://cdn.saya.uz/photos/webp-1200p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp1200/%s.webp thumbnail800p: - baseUrl: https://cdn.saya.uz/photos/webp-800p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp800/%s.webp thumbnail560p: - baseUrl: https://cdn.saya.uz/photos/webp-560p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp560/%s.webp thumbnail320p: - baseUrl: https://cdn.saya.uz/photos/webp-320p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp320/%s.webp homePageGifs: - baseUrl: https://cdn.saya.uz/stats/home-page-gifs/otter-%s.gif - indexes: ["1", "2", "3"] + baseUrl: https://storage.yandexcloud.kz/sayauz-static/home-page-gifs/otter-%s.gif + indexes: ['1', '2', '3'] staticStorage: - baseUrl: https://cdn.saya.uz/stats - map: - baseUrl: https://cdn.saya.uz/map - pmTiles: global.pmtiles + baseUrl: https://storage.yandexcloud.kz/sayauz-static allowOrigins: - - https://cdn.saya.uz + - https://storage.yandexcloud.kz diff --git a/config/config.stage.yaml b/config/config.stage.yaml index d8819ca..ab86709 100644 --- a/config/config.stage.yaml +++ b/config/config.stage.yaml @@ -1,81 +1,69 @@ logLevel: debug -endpoint: - type: unix - config: - path: "/etc/sayauz/stage.socket" - chmod: '0666' blogPages: storage: - type: s3 + type: b2 config: - bucketName: sayauz-pages - region: kz1 - prefix: "stage-" - endpoint: "https://storage.yandexcloud.kz" - usePathStyle: true - accessKeyID: "${S3_ACCESS_KEY_ID}" - secretAccessKey: "${S3_SECRET_ACCESS_KEY}" + bucketName: sayana-pages + region: eu-central-003 + prefix: 'stage-' + keyID: '${B2_KEY_ID}' + applicationKey: '${B2_APPLICATION_KEY}' factGiver: storage: - type: s3 + type: b2 config: - bucketName: sayauz-pages - region: kz1 - prefix: "" - endpoint: "https://storage.yandexcloud.kz" - usePathStyle: true - accessKeyID: "${S3_ACCESS_KEY_ID}" - secretAccessKey: "${S3_SECRET_ACCESS_KEY}" - factsFileName: "facts-*.txt" + bucketName: sayana-pages + region: eu-central-003 + prefix: '' + keyID: '${B2_KEY_ID}' + applicationKey: '${B2_APPLICATION_KEY}' + factsFileName: 'facts-*.txt' localePath: ./locale/ availableLanguages: - name: ru alt: Русский - flag: https://cdn.saya.uz/stats/flags/ru.svg + flag: https://storage.yandexcloud.kz/sayauz-static/flags/ru.svg locFile: localization.ru.yaml - name: en alt: English - flag: https://cdn.saya.uz/stats/flags/gb.svg + flag: https://storage.yandexcloud.kz/sayauz-static/flags/gb.svg locFile: localization.en.yaml auth: db: type: sqlite3 config: - dsn: "file:/data/auth.db?cache=private&mode=rwc&_locking_mode=EXCLUSIVE&_mutex=no&_auto_vacuum=2&_journal_mode=WAL" - salt: "${AUTH_SALT}" + dsn: 'file:/data/auth.db?cache=private&mode=rwc&_locking_mode=EXCLUSIVE&_mutex=no&_auto_vacuum=2&_journal_mode=WAL' + salt: '${AUTH_SALT}' mail: - clientHost: "${FQDN}" - mailHost: "${MAIL_HOST}" - publicName: "STAGE.SAYA.UZ" - mailAddress: "${MAIL_ADDRESS}" - username: "${MAIL_USERNAME}" - password: "${MAIL_PASSWORD}" - salt: "${MAIL_SALT}" + clientHost: '${FQDN}' + mailHost: '${MAIL_HOST}' + publicName: 'DEMO.SAYA.TODAY' + mailAddress: '${MAIL_ADDRESS}' + username: '${MAIL_USERNAME}' + password: '${MAIL_PASSWORD}' + salt: '${MAIL_SALT}' trigger: onNewPost: "0/3 * * * *" -canonicalEndpoint: "https://${FQDN}" +canonicalEndpoint: 'https://${FQDN}' photoStorage: full: - baseUrl: https://cdn.saya.uz/photos/jpeg-full/%s + baseUrl: https://storage.yandexcloud.kz/sayauz-photos/%s webp: - baseUrl: https://cdn.saya.uz/photos/webp-full/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp/%s.webp thumbnail1600p: - baseUrl: https://cdn.saya.uz/photos/webp-1600p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp1600/%s.webp thumbnail1200p: - baseUrl: https://cdn.saya.uz/photos/webp-1200p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp1200/%s.webp thumbnail800p: - baseUrl: https://cdn.saya.uz/photos/webp-800p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp800/%s.webp thumbnail560p: - baseUrl: https://cdn.saya.uz/photos/webp-560p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp560/%s.webp thumbnail320p: - baseUrl: https://cdn.saya.uz/photos/webp-320p/%s.webp + baseUrl: https://storage.yandexcloud.kz/sayauz-thumbnails-webp320/%s.webp homePageGifs: - baseUrl: https://cdn.saya.uz/stats/home-page-gifs/otter-%s.gif - indexes: ["1", "2", "3"] + baseUrl: https://storage.yandexcloud.kz/sayauz-static/home-page-gifs/otter-%s.gif + indexes: ['1', '2', '3'] staticStorage: - baseUrl: https://cdn.saya.uz/stats - map: - baseUrl: https://cdn.saya.uz/map - pmTiles: global.pmtiles + baseUrl: https://storage.yandexcloud.kz/sayauz-static allowOrigins: - - https://cdn.saya.uz + - https://storage.yandexcloud.kz |