Compare commits

..

2 Commits

Author SHA1 Message Date
79fbbd1862 Use env vars when config.yaml not exist
All checks were successful
Server Check Build (NixCN CMS) TeamCity build finished
Signed-off-by: Asai Neko <sugar@sne.moe>
2026-02-18 16:47:11 +08:00
e8571492f0 Fix deploy files
Signed-off-by: Asai Neko <sugar@sne.moe>
2026-02-18 14:30:26 +08:00
3 changed files with 14 additions and 10 deletions

View File

@@ -26,11 +26,15 @@ func Init() {
viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_")) viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
viper.AutomaticEnv() viper.AutomaticEnv()
conf := &config{}
if err := viper.ReadInConfig(); err != nil { if err := viper.ReadInConfig(); err != nil {
// Dont generate config when using dev mode if _, ok := err.(viper.ConfigFileNotFoundError); ok {
log.Fatalln("[Config] Can't read config!") log.Println("[Config] No config file found, using Env vars only.")
} else {
log.Fatalf("[Config] Fatal error reading config file: %s \n", err)
} }
}
conf := &config{}
if err := viper.Unmarshal(conf); err != nil { if err := viper.Unmarshal(conf); err != nil {
log.Fatalln("[Condig] Can't unmarshal config!") log.Fatalln("[Condig] Can't unmarshal config!")
} }

View File

@@ -1,11 +1,11 @@
test.nix.org.cn { test.nix.org.cn {
tls /etc/caddy/cert.crt /etc/caddy/key.pem tls /etc/caddy/cert.crt /etc/caddy/cert.key
handle /app/api/* { handle /app/api/* {
reverse_proxy backend:8000 reverse_proxy cms-server:8000
} }
handle /app/* { handle /app/* {
reverse_proxy client-cms:3000 reverse_proxy cms-client:3000
} }
} }

View File

@@ -1,7 +1,7 @@
services: services:
postgres: postgres:
image: docker.io/postgres:18-alpine image: docker.io/postgres:18-alpine
container_name: cms-db container_name: postgres
environment: environment:
POSTGRES_USER: postgres POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres POSTGRES_PASSWORD: postgres
@@ -18,7 +18,7 @@ services:
redis: redis:
image: docker.io/redis:8-alpine image: docker.io/redis:8-alpine
container_name: cms-redis container_name: redis
volumes: volumes:
- ./data/redis:/data - ./data/redis:/data
healthcheck: healthcheck:
@@ -29,7 +29,7 @@ services:
lgtm: lgtm:
image: grafana/otel-lgtm:latest image: grafana/otel-lgtm:latest
container_name: lgtm-stack container_name: lgtm
ports: ports:
- "3000:3000" - "3000:3000"
- "4317:4317" # OTLP gRPC - "4317:4317" # OTLP gRPC
@@ -48,7 +48,7 @@ services:
caddy: caddy:
image: docker.io/caddy:latest image: docker.io/caddy:latest
container_name: caddy-proxy container_name: caddy
restart: always restart: always
ports: ports:
- "80:80" - "80:80"