Merge pull request #17543 from stintel/vallumd

vallumd: bump to 0.2.0

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

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

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