From efa05d7633e97832e28d4e051b42c92d01026514 Mon Sep 17 00:00:00 2001 From: Petri Hienonen Date: Fri, 2 Jan 2026 20:53:24 +0200 Subject: Second commit --- .env | 0 .gitignore | 2 +- flake.nix | 2 +- go.mod | 6 +++--- go.sum | 8 ++++---- hub | Bin 9569432 -> 0 bytes hub.service | 18 ------------------ main.go | 12 ++++++------ pub.service | 18 ++++++++++++++++++ 9 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 .env delete mode 100755 hub delete mode 100644 hub.service create mode 100644 pub.service diff --git a/.env b/.env new file mode 100644 index 0000000..e69de29 diff --git a/.gitignore b/.gitignore index 122a5d7..79f9a60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -hub +pub diff --git a/flake.nix b/flake.nix index c71dbdf..c9c7371 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Hub"; + description = "Pub"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; }; diff --git a/go.mod b/go.mod index f83dc31..54112f1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module hub +module pub go 1.25.5 @@ -6,6 +6,6 @@ require github.com/eclipse/paho.mqtt.golang v1.5.1 require ( github.com/gorilla/websocket v1.5.3 // indirect - golang.org/x/net v0.44.0 // indirect - golang.org/x/sync v0.17.0 // indirect + golang.org/x/net v0.48.0 // indirect + golang.org/x/sync v0.19.0 // indirect ) diff --git a/go.sum b/go.sum index 9abe94c..586bb58 100644 --- a/go.sum +++ b/go.sum @@ -2,7 +2,7 @@ github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2I github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= -golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= -golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= -golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= +golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY= +golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= +golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= diff --git a/hub b/hub deleted file mode 100755 index 1a7fb2a..0000000 Binary files a/hub and /dev/null differ diff --git a/hub.service b/hub.service deleted file mode 100644 index 34eb743..0000000 --- a/hub.service +++ /dev/null @@ -1,18 +0,0 @@ -# /etc/systemd/system/atom-publisher.service -[Unit] -Description=Data Publication HUB -After=network.target -StartLimitIntervalSec=10 - -[Service] -DynamicUser=true -Type=simple -Restart=always -RestartSec=10 -User=publisher -ExecStart=/usr/local/bin/hub -MemoryHigh=20M -MemoryMax=30M - -[Install] -WantedBy=multi-user.target diff --git a/main.go b/main.go index f9afd40..4a3ad9e 100644 --- a/main.go +++ b/main.go @@ -43,8 +43,8 @@ type Config struct { HelLon float64 `env:"HEL_LON" default:"24.9384"` // MQTT - MQTTBroker string `env:"MQTT_BROKER" default:"tcp://localhost:1883"` - MQTTClientID string `env:"MQTT_CLIENT_ID" default:"fmi-poller"` + MQTTBroker string `env:"MQTT_BROKER" default:"tcp://tammi.cc:1883"` + MQTTClientID string `env:"MQTT_CLIENT_ID" default:"pub"` MQTTUsername string `env:"MQTT_USERNAME"` MQTTPassword string `env:"MQTT_PASSWORD"` @@ -190,10 +190,10 @@ func loadConfig() *Config { FcPollEvery: parseDuration(getEnv("FC_POLL_EVERY", "1h")), HelLat: parseFloat(getEnv("HEL_LAT", "60.1699")), HelLon: parseFloat(getEnv("HEL_LON", "24.9384")), - MQTTBroker: getEnv("MQTT_BROKER", "tcp://localhost:1883"), - MQTTClientID: getEnv("MQTT_CLIENT_ID", "fmi-poller"), - MQTTUsername: getEnv("MQTT_USERNAME", ""), - MQTTPassword: getEnv("MQTT_PASSWORD", ""), + MQTTBroker: getEnv("MQTT_BROKER", "tcp://tammi.cc:1883"), + MQTTClientID: getEnv("MQTT_CLIENT_ID", "pub"), + MQTTUsername: getEnv("MQTT_USERNAME", "host"), + MQTTPassword: getEnv("MQTT_PASSWORD", "salasana"), LogLevel: getEnv("LOG_LEVEL", "info"), HTTPTimeout: parseDuration(getEnv("HTTP_TIMEOUT", "30s")), MaxRetries: parseInt(getEnv("MAX_RETRIES", "3")), diff --git a/pub.service b/pub.service new file mode 100644 index 0000000..34eb743 --- /dev/null +++ b/pub.service @@ -0,0 +1,18 @@ +# /etc/systemd/system/atom-publisher.service +[Unit] +Description=Data Publication HUB +After=network.target +StartLimitIntervalSec=10 + +[Service] +DynamicUser=true +Type=simple +Restart=always +RestartSec=10 +User=publisher +ExecStart=/usr/local/bin/hub +MemoryHigh=20M +MemoryMax=30M + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3-70-g09d2