X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.init;h=dc984ad2cab68239bf1a4f5b8cb87ded8b592c89;hb=1052300e95f159ecded8c1b392c3cb35d2713f51;hp=30cd6e2714c45978f75d37ba5a41e831ec7f3126;hpb=da62714c855a89f1b50d21844fa8f1e709850ebb;p=monitor.git diff --git a/monitor-server.init b/monitor-server.init index 30cd6e2..dc984ad 100644 --- 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