Commit 276fc6cf authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed CWMP configurator for zabbix proxy

parent f4e7254f
...@@ -45,13 +45,13 @@ zabbix_set_agent_server() { ...@@ -45,13 +45,13 @@ zabbix_set_agent_server() {
} }
zabbix_get_proxy_server() { zabbix_get_proxy_server() {
echo `$UCI_GET zabbix.proxy.hostname` echo `$UCI_GET zabbix.proxy.server`
} }
zabbix_set_proxy_server() { zabbix_set_proxy_server() {
local hostname=`$UCI_GET zabbix.proxy.hostname` local server=`$UCI_GET zabbix.proxy.server`
if [ "$hostname" != "$1" ]; then if [ "$server" != "$1" ]; then
$UCI_SET zabbix.proxy.hostname="$1" $UCI_SET zabbix.proxy.server="$1"
$UCI_COMMIT $UCI_COMMIT
chmod a+r /etc/config/zabbix chmod a+r /etc/config/zabbix
fi fi
......
...@@ -13,7 +13,7 @@ if [ ! -z "$DBSERVER" ] && [ ! -z "$DATABASE" ] && [ ! -z "$USER" ] && [ ! -z "$ ...@@ -13,7 +13,7 @@ if [ ! -z "$DBSERVER" ] && [ ! -z "$DATABASE" ] && [ ! -z "$USER" ] && [ ! -z "$
echo "DBName=$DATABASE" >> /etc/zabbix_proxy.conf.d/zabbix_proxy.conf echo "DBName=$DATABASE" >> /etc/zabbix_proxy.conf.d/zabbix_proxy.conf
echo "DBUser=$USER" >> /etc/zabbix_proxy.conf.d/zabbix_proxy.conf echo "DBUser=$USER" >> /etc/zabbix_proxy.conf.d/zabbix_proxy.conf
echo "DBPassword=$PASSWORD" >> /etc/zabbix_proxy.conf.d/zabbix_proxy.conf echo "DBPassword=$PASSWORD" >> /etc/zabbix_proxy.conf.d/zabbix_proxy.conf
echo "Server=$SERVER" > /etc/zabbix_proxy.conf.d/zabbix_proxy.conf echo "Server=$SERVER" >> /etc/zabbix_proxy.conf.d/zabbix_proxy.conf
if [ ! -z "$START_POLLERS" ]; then if [ ! -z "$START_POLLERS" ]; then
echo "StartPollers=$START_POLLERS" >> /etc/zabbix_proxy.conf.d/zabbix_proxy.conf echo "StartPollers=$START_POLLERS" >> /etc/zabbix_proxy.conf.d/zabbix_proxy.conf
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment