From 1811f4e42f738eaeab6c8998bde1781d74bba325 Mon Sep 17 00:00:00 2001
From: Erik Karlsson <erik.karlsson@genexis.eu>
Date: Thu, 9 Mar 2023 23:13:46 +0100
Subject: [PATCH] bbf: remove uci-defaults script for mosquitto

This script is moved to the mosquitto package.
---
 bbf/Makefile                                  |  4 --
 .../etc/uci-defaults/01-mosquitto-config      | 46 -------------------
 2 files changed, 50 deletions(-)
 delete mode 100644 bbf/files/etc/uci-defaults/01-mosquitto-config

diff --git a/bbf/Makefile b/bbf/Makefile
index 9f34e82c4..3adfffb74 100644
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -164,10 +164,6 @@ define Package/libbbfdm/default/install
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
-ifeq ($(CONFIG_PACKAGE_mosquitto-ssl),y)
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-mosquitto-config $(1)/etc/uci-defaults/
-endif
 endef
 
 define Package/libbbfdm/default/prerm
diff --git a/bbf/files/etc/uci-defaults/01-mosquitto-config b/bbf/files/etc/uci-defaults/01-mosquitto-config
deleted file mode 100644
index e4d4df2d1..000000000
--- a/bbf/files/etc/uci-defaults/01-mosquitto-config
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-config_mosquitto_owrt() {
-	sec=$(uci -q get mosquitto.owrt)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q add mosquitto owrt)
-		uci -q rename mosquitto."${sec}=owrt"
-	fi
-
-	uci -q set mosquitto.owrt.use_uci="1"
-	uci -q set mosquitto.owrt.write_pid="1"
-	uci -q commit mosquitto
-}
-
-config_mosquitto_general() {
-	sec=$(uci -q get mosquitto.mosquitto)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q add mosquitto mosquitto)
-		uci -q rename mosquitto."${sec}=mosquitto"
-	fi
-
-	uci -q set mosquitto.mosquitto.log_dest="syslog"
-	uci -q set mosquitto.mosquitto.log_facility="5"
-	uci -q set mosquitto.mosquitto.log_timestamp="1"
-	uci -q set mosquitto.mosquitto.log_types="error"
-	uci -q set mosquitto.mosquitto.per_listener_settings="1"
-	uci -q commit mosquitto
-}
-
-config_mosquitto_persistence() {
-	sec=$(uci -q get mosquitto.persistence)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q add mosquitto persistence)
-		uci -q rename mosquitto."${sec}=persistence"
-	fi
-
-	uci -q set mosquitto.persistence.persistence="0"
-	uci -q set mosquitto.persistence.location="/var/run"
-	uci -q commit mosquitto
-}
-
-if [ -f "/etc/config/mosquitto" ]; then 
-	config_mosquitto_owrt
-	config_mosquitto_general
-	config_mosquitto_persistence
-fi