summaryrefslogtreecommitdiff
path: root/config
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.go37
-rw-r--r--config/config.local.yaml47
-rw-r--r--config/config.prod.yaml26
-rw-r--r--config/config.stage.yaml26
4 files changed, 0 insertions, 136 deletions
diff --git a/config/config.go b/config/config.go
index 1393dd8..8c0321e 100644
--- a/config/config.go
+++ b/config/config.go
@@ -11,11 +11,8 @@ 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"`
- Mail MailConfig `json:"Mail" yaml:"mail" validate:"required"`
}
type BlogPagesConfig struct {
@@ -35,11 +32,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,35 +39,6 @@ type AvailableLanguageConfig struct {
LocFile string `json:"LocFile" yaml:"locFile" validate:"required,filepath"`
}
-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"`
-}
-
-type MailConfig struct {
- ClientHost string `json:"ClientHost" yaml:"clientHost" validate:"required"`
- MailHost string `json:"MailHost" yaml:"mailHost" validate:"required"`
- PublicName string `json:"PublicName" yaml:"publicName" validate:"required"`
- MailAddress string `json:"MailAddress" yaml:"mailAddress" validate:"required"`
- Username string `json:"Username" yaml:"username" validate:"required"`
- Password string `json:"Password" yaml:"password" validate:"required"`
- Salt string `json:"Salt" yaml:"salt" validate:"required"`
- Trigger TriggerConfig `json:"Trigger" yaml:"trigger" validate:"required"`
-}
-
-type TriggerConfig struct {
- OnNewPost string `json:"OnNewPost" yaml:"onNewPost" validate:"cron,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
deleted file mode 100644
index e23c808..0000000
--- a/config/config.local.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-logLevel: debug
-blogPages:
- storage:
- type: b2
- config:
- bucketName: sayana-pages
- region: eu-central-003
- 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
- alt: Русский
- flag: https://f003.backblazeb2.com/file/sayana-static/flags/ru.svg
- locFile: localization.ru.yaml
- - name: en
- alt: English
- flag: https://f003.backblazeb2.com/file/sayana-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'
-mail:
- 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: "* * * * *"
diff --git a/config/config.prod.yaml b/config/config.prod.yaml
index 0bee79d..2d050bf 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
@@ -28,19 +18,3 @@ availableLanguages:
alt: English
flag: https://f003.backblazeb2.com/file/sayana-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}'
-mail:
- clientHost: '${FQDN}'
- mailHost: '${MAIL_HOST}'
- publicName: 'SAYA.TODAY'
- mailAddress: '${MAIL_ADDRESS}'
- username: '${MAIL_USERNAME}'
- password: '${MAIL_PASSWORD}'
- salt: '${MAIL_SALT}'
- trigger:
- onNewPost: "0/5 * * * *"
diff --git a/config/config.stage.yaml b/config/config.stage.yaml
index 1c15dae..a34a33e 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
@@ -28,19 +18,3 @@ availableLanguages:
alt: English
flag: https://f003.backblazeb2.com/file/sayana-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}'
-mail:
- 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 * * * *"
generated by cgitext v1.3.1+17 (git 2.54.0) at 2026-09-13 19:24:06 +0000