diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2022-01-09 18:24:24 +0200 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2022-01-09 18:31:47 +0200 |
| commit | 31fd0f03b2b13b9b762ea9e10507ccf80ec9324d (patch) | |
| tree | 0c046e61b321c28ff6d44796ad9be3ee9e3d5ae6 | |
| parent | 47c31b47460ba3015c25001685cbfdf76b73f025 (diff) | |
vallumd: bump to 0.2.0
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
| -rw-r--r-- | net/vallumd/Makefile | 8 | ||||
| -rw-r--r-- | net/vallumd/files/vallumd.conf | 4 | ||||
| -rw-r--r-- | net/vallumd/files/vallumd.init | 11 |
3 files changed, 16 insertions, 7 deletions
diff --git a/net/vallumd/Makefile b/net/vallumd/Makefile index e673b9406..5edc128a5 100644 --- a/net/vallumd/Makefile +++ b/net/vallumd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vallumd -PKG_VERSION:=0.1.4 +PKG_VERSION:=0.2.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/stintel/vallumd/tar.gz/vallumd-$(PKG_VERSION)? -PKG_HASH:=d6119f84840ff36f05c273f0a6f3e0f9eacf3a07c1583271c4fef62a7b199428 +PKG_SOURCE_URL:=https://codeload.github.com/stintel/vallumd/tar.gz/$(PKG_VERSION)? +PKG_HASH:=7c1baffa3f7889c9c6f2795aac134c50a309ef201764d5ce6bbbce5d657416c0 PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be> PKG_LICENSE:=GPL-3.0 @@ -26,7 +26,7 @@ define Package/vallumd SECTION:=net CATEGORY:=Network TITLE:=Centralized or distributed blacklist - DEPENDS:=+ipset +libmosquitto + DEPENDS:=+ca-bundle +ipset +libmosquitto +libopenssl endef define Package/vallumd/description diff --git a/net/vallumd/files/vallumd.conf b/net/vallumd/files/vallumd.conf index 75703abb7..5aa6e11d6 100644 --- a/net/vallumd/files/vallumd.conf +++ b/net/vallumd/files/vallumd.conf @@ -1,6 +1,10 @@ config vallumd mqtt option host 127.0.0.1 option port 1883 + option tls 0 + option ca /etc/ssl/certs/ca-certificates.crt + # option user username + # option pass password list topics blacklist4 list topics blacklist6 option enabled 0 diff --git a/net/vallumd/files/vallumd.init b/net/vallumd/files/vallumd.init index d0cb78150..f9ff60836 100644 --- a/net/vallumd/files/vallumd.init +++ b/net/vallumd/files/vallumd.init @@ -9,23 +9,28 @@ add_topic() { } start_service() { - local enabled - local mqtt_host - local mqtt_port + local enabled mqtt_ca mqtt_host mqtt_pass mqtt_port mqtt_tls mqtt_user config_load "vallumd" config_get_bool enabled "mqtt" "enabled" 1 [ "$enabled" -gt 0 ] || return 1 + config_get mqtt_ca "mqtt" "ca" config_get mqtt_host "mqtt" "host" + config_get mqtt_pass "mqtt" "pass" config_get mqtt_port "mqtt" "port" + config_get mqtt_tls "mqtt" "tls" + config_get mqtt_user "mqtt" "user" procd_open_instance procd_set_param command $PROG [ -n "$mqtt_host" ] && procd_append_param command -h "$mqtt_host" + [ -n "$mqtt_pass" ] && procd_append_param command -P "$mqtt_pass" [ -n "$mqtt_port" ] && procd_append_param command -p "$mqtt_port" + [ -n "$mqtt_user" ] && procd_append_param command -u "$mqtt_user" + [ $mqtt_tls -gt 0 ] && procd_append_param command -T -c "$mqtt_ca" config_list_foreach mqtt topics add_topic procd_set_param respawn |