bbcf0a1228
Player-UI (playerserver): - Lokale Kiosk-Seite unter /player mit orientierungsgerechtem Splash-Bild - Splash-PNGs (Portrait/Landscape) eingebettet via go:embed - Unteres-Drittel-Overlay mit erweiterbaren Sysinfo-Items (Hostname, Uptime) - /api/now-playing und /api/sysinfo JSON-Endpunkte - iframe-Overlay fuer spaetere Inhalts-URL Ansible-Rolle signage_display (neu): - Pakete: xserver-xorg-core, xinit, openbox, chromium, unclutter - Kiosk-Skript mit openbox als WM (noetig fuer korrektes --kiosk-Vollbild) - systemd-Unit mit Conflicts=getty@tty1 (behebt TTY-Blockierung beim Start) - Chromium Managed Policy: TranslateEnabled=false, Notifications/Geolocation blockiert - --lang=de Flag gegen Sprachauswahl-Dialog Ansible-Rolle signage_player (erweitert): - Legt signage_user an falls nicht vorhanden - PlayerListenAddr und PlayerContentURL in Konfiguration - journald volatile Storage (SD-Karten-Schonung) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
95 lines
2.5 KiB
Go
95 lines
2.5 KiB
Go
package config
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
)
|
|
|
|
type Config struct {
|
|
ScreenID string `json:"screen_id"`
|
|
ServerBaseURL string `json:"server_base_url"`
|
|
MQTTBroker string `json:"mqtt_broker"`
|
|
MQTTUsername string `json:"mqtt_username"`
|
|
MQTTPassword string `json:"mqtt_password"`
|
|
HeartbeatEvery int `json:"heartbeat_every_seconds"`
|
|
StatusReportEvery int `json:"status_report_every_seconds"`
|
|
PlayerListenAddr string `json:"player_listen_addr"`
|
|
PlayerContentURL string `json:"player_content_url"`
|
|
}
|
|
|
|
const defaultConfigPath = "/etc/signage/config.json"
|
|
|
|
func Load() (Config, error) {
|
|
cfg := defaultConfig()
|
|
|
|
configPath := getenv("MORZ_INFOBOARD_CONFIG", defaultConfigPath)
|
|
if err := loadFromFile(configPath, &cfg); err != nil {
|
|
if !os.IsNotExist(err) {
|
|
return Config{}, fmt.Errorf("load config file: %w", err)
|
|
}
|
|
}
|
|
|
|
overrideFromEnv(&cfg)
|
|
|
|
if cfg.ScreenID == "" {
|
|
return Config{}, fmt.Errorf("screen id is required")
|
|
}
|
|
|
|
if cfg.HeartbeatEvery <= 0 {
|
|
cfg.HeartbeatEvery = defaultConfig().HeartbeatEvery
|
|
}
|
|
|
|
if cfg.StatusReportEvery <= 0 {
|
|
cfg.StatusReportEvery = defaultConfig().StatusReportEvery
|
|
}
|
|
|
|
return cfg, nil
|
|
}
|
|
|
|
func defaultConfig() Config {
|
|
return Config{
|
|
ScreenID: "unset-screen",
|
|
ServerBaseURL: "http://127.0.0.1:8080",
|
|
MQTTBroker: "",
|
|
HeartbeatEvery: 30,
|
|
StatusReportEvery: 60,
|
|
PlayerListenAddr: "127.0.0.1:8090",
|
|
PlayerContentURL: "",
|
|
}
|
|
}
|
|
|
|
func loadFromFile(path string, cfg *Config) error {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return json.Unmarshal(data, cfg)
|
|
}
|
|
|
|
func overrideFromEnv(cfg *Config) {
|
|
cfg.ScreenID = getenv("MORZ_INFOBOARD_SCREEN_ID", cfg.ScreenID)
|
|
cfg.ServerBaseURL = getenv("MORZ_INFOBOARD_SERVER_URL", cfg.ServerBaseURL)
|
|
cfg.MQTTBroker = getenv("MORZ_INFOBOARD_MQTT_BROKER", cfg.MQTTBroker)
|
|
cfg.MQTTUsername = getenv("MORZ_INFOBOARD_MQTT_USERNAME", cfg.MQTTUsername)
|
|
cfg.MQTTPassword = getenv("MORZ_INFOBOARD_MQTT_PASSWORD", cfg.MQTTPassword)
|
|
cfg.PlayerListenAddr = getenv("MORZ_INFOBOARD_PLAYER_ADDR", cfg.PlayerListenAddr)
|
|
cfg.PlayerContentURL = getenv("MORZ_INFOBOARD_PLAYER_CONTENT_URL", cfg.PlayerContentURL)
|
|
if value := getenv("MORZ_INFOBOARD_STATUS_REPORT_EVERY", ""); value != "" {
|
|
var parsed int
|
|
_, _ = fmt.Sscanf(value, "%d", &parsed)
|
|
if parsed > 0 {
|
|
cfg.StatusReportEvery = parsed
|
|
}
|
|
}
|
|
}
|
|
|
|
func getenv(key, fallback string) string {
|
|
value := os.Getenv(key)
|
|
if value == "" {
|
|
return fallback
|
|
}
|
|
|
|
return value
|
|
}
|