Separated Server and ServerActive agent settings

Makefile

@@ -52,6 +52,7 @@ define ZABBIX_AGENT_CONFIG
 
 config zabbix 'agent'
 	option server ''
+	option serveractive ''
 endef
 export ZABBIX_AGENT_CONFIG
 

zabbix_agent

@@ -17,6 +17,7 @@ entry_execute_method_root_Zabbix() {
 		common_execute_method_obj "$DMROOT.Zabbix." "0"
 		common_execute_method_obj "$DMROOT.Zabbix.Agent." "0"
 		common_execute_method_param "$DMROOT.Zabbix.Agent.Server" "1" "zabbix_get_agent_server" "zabbix_set_agent_server"
+		common_execute_method_param "$DMROOT.Zabbix.Agent.ServerActive" "1" "zabbix_get_agent_serveractive" "zabbix_set_agent_serveractive"
 		return 0;
 		;;
 	esac
@@ -39,3 +40,17 @@ zabbix_set_agent_server() {
 		chmod a+r /etc/config/zabbix
 	fi
 }
+
+zabbix_get_agent_serveractive() {
+	echo `$UCI_GET zabbix.agent.serveractive`
+}
+
+zabbix_set_agent_serveractive() {
+	local serveractive=`$UCI_GET zabbix.agent.serveractive`
+	if [ "$serveractive" != "$1" ]; then
+		$UCI_SET zabbix.agent.serveractive="$1"
+		$UCI_COMMIT
+		chmod a+r /etc/config/zabbix
+	fi
+}
+

zabbix_agentd-configure

 #!/bin/sh
 
 SERVER=`/sbin/uci -q get zabbix.agent.server`
+SERVERACTIVE=`/sbin/uci -q get zabbix.agent.serveractive`
+
 if [ ! -z "$SERVER" ]; then
     echo "Server=$SERVER" > /etc/zabbix_agentd.conf.d/zabbix_agent.conf
-    echo "ServerActive=$SERVER" >> /etc/zabbix_agentd.conf.d/zabbix_agent.conf
 else
     exit 1
 fi
+
+if [ ! -z "$SERVERACTIVE" ]; then
+    echo "ServerActive=$SERVERACTIVE" >> /etc/zabbix_agentd.conf.d/zabbix_agent.conf
+fi