completed updates to the info model.

[monitor.git] / monitor-server.init

diff --git a/monitor-server.init b/monitor-server.init
index 30cd6e2..dc984ad 100644 (file)
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -98,8 +98,8 @@ function if_present_load ()
 }
 function check_monitor_schema_and_data() 
 {
-       # NOTE: call create_all() to setup the database from the infovacuum model.
-       python -c "from monitor.database.infovacuum import *; from elixir import create_all; create_all()"
+       # NOTE: call create_all() to setup the database from the info model.
+       python -c "from monitor.database.info.model import *; from elixir import create_all; create_all()"
 }
 
 function check_zabbix_schema_and_data() 
@@ -241,6 +241,7 @@ function check_zab_server ()
                    -e "s#DBName=.*#DBName=$ZABBIX_DB_NAME#g" \
                    -e "s#DBUser=.*#DBUser=$ZABBIX_DB_USER#g" \
                    -e "s#DBPassword=.*#DBPassword=$PLC_MONITOR_DBPASSWORD#g" \
+                   -e "s/.*ExternalScripts=.*/ExternalScripts=${MONITORPATH}\/zabbix/g" \
                    ${ZABBIXCFG}/zabbix_server.conf > $TMP_FILE
                cat $TMP_FILE > ${ZABBIXCFG}/zabbix_server.conf
        fi