Diffstat (limited to 'config')
| -rw-r--r-- | config/config.go | 18 | ||||
| -rw-r--r-- | config/config.local.yaml | 14 | ||||
| -rw-r--r-- | config/config.prod.yaml | 12 | ||||
| -rw-r--r-- | config/config.stage.yaml | 12 |
4 files changed, 5 insertions, 51 deletions
diff --git a/config/config.go b/config/config.go index f57b5cd..fe0ac72 100644 --- a/config/config.go +++ b/config/config.go @@ -11,7 +11,6 @@ import ( type Config struct { LogLevel slog.Level `json:"LogLevel" yaml:"logLevel" 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"` AvailableLanguages []AvailableLanguageConfig `json:"AvailableLanguages" yaml:"availableLanguages" validate:"required"` Auth AuthConfig `json:"Auth" yaml:"auth" validate:"required"` @@ -34,11 +33,6 @@ type B2Config struct { ApplicationKey string `json:"ApplicationKey" yaml:"applicationKey"` } -type FactGiverConfig struct { - Storage StorageConfig `json:"Storage" yaml:"storage" validate:"required"` - FactsFileName string `json:"FactsFileName" yaml:"factsFileName" validate:"required"` -} - type AvailableLanguageConfig struct { Name string `json:"Name" yaml:"name" validate:"required"` Alt string `json:"Alt" yaml:"alt"` @@ -47,17 +41,7 @@ type AvailableLanguageConfig struct { } type AuthConfig struct { - Salt string `json:"Salt" yaml:"salt" validate:"required"` - Db DbConfig `json:"Db" yaml:"db" validate:"required"` -} - -type DbConfig struct { - Type string `json:"Type" yaml:"type" validate:"required,oneof=sqlite3"` - Cfg Sqlite3Config `json:"Config" yaml:"config"` -} - -type Sqlite3Config struct { - DSN string `json:"DSN" yaml:"dsn" validate:"required"` + Salt string `json:"Salt" yaml:"salt" validate:"required"` } func LoadConfig(path string, config *Config) error { diff --git a/config/config.local.yaml b/config/config.local.yaml index 6d0abf3..330e29c 100644 --- a/config/config.local.yaml +++ b/config/config.local.yaml @@ -8,16 +8,6 @@ blogPages: prefix: 'stage-' keyID: '${B2_KEY_ID}' applicationKey: '${B2_APPLICATION_KEY}' -factGiver: - storage: - type: b2 - config: - bucketName: sayana-pages - region: eu-central-003 - prefix: '' - keyID: '${B2_KEY_ID}' - applicationKey: '${B2_APPLICATION_KEY}' - factsFileName: 'facts-*.txt' localePath: ./locale/ availableLanguages: - name: ru @@ -30,7 +20,7 @@ availableLanguages: locFile: localization.en.yaml auth: db: - type: sqlite3 + type: sqlite config: - dsn: 'file:/tmp/auth.db?cache=shared&mode=rwc' + dsn: 'file:/data/auth.db?cache=shared&mode=memory' salt: '123' diff --git a/config/config.prod.yaml b/config/config.prod.yaml index 38981a8..76288fa 100644 --- a/config/config.prod.yaml +++ b/config/config.prod.yaml @@ -8,16 +8,6 @@ blogPages: prefix: 'prod-' keyID: '${B2_KEY_ID}' applicationKey: '${B2_APPLICATION_KEY}' -factGiver: - storage: - type: b2 - config: - bucketName: sayana-pages - region: eu-central-003 - prefix: '' - keyID: '${B2_KEY_ID}' - applicationKey: '${B2_APPLICATION_KEY}' - factsFileName: 'facts-*.txt' localePath: ./locale/ availableLanguages: - name: ru @@ -30,7 +20,7 @@ availableLanguages: locFile: localization.en.yaml auth: db: - type: sqlite3 + type: sqlite config: dsn: 'file:/data/auth.db?cache=private&mode=rwc&_locking_mode=EXCLUSIVE&_mutex=no&_auto_vacuum=2' salt: '${AUTH_SALT}' diff --git a/config/config.stage.yaml b/config/config.stage.yaml index b05edaf..f6c16cb 100644 --- a/config/config.stage.yaml +++ b/config/config.stage.yaml @@ -8,16 +8,6 @@ blogPages: prefix: 'stage-' keyID: '${B2_KEY_ID}' applicationKey: '${B2_APPLICATION_KEY}' -factGiver: - storage: - type: b2 - config: - bucketName: sayana-pages - region: eu-central-003 - prefix: '' - keyID: '${B2_KEY_ID}' - applicationKey: '${B2_APPLICATION_KEY}' - factsFileName: 'facts-*.txt' localePath: ./locale/ availableLanguages: - name: ru @@ -30,7 +20,7 @@ availableLanguages: locFile: localization.en.yaml auth: db: - type: sqlite3 + type: sqlite config: dsn: 'file:/data/auth.db?cache=private&mode=rwc&_locking_mode=EXCLUSIVE&_mutex=no&_auto_vacuum=2' salt: '${AUTH_SALT}' |