git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hope I got the merge wright...
[monitor.git]
/
monitor-server.init
diff --git
a/monitor-server.init
b/monitor-server.init
index
aed298c
..
32d1209
100644
(file)
--- a/
monitor-server.init
+++ b/
monitor-server.init
@@
-75,10
+75,11
@@
function check_gadget_config ()
done
}
done
}
-function check_monitor_schema_and_data()
+function check_monitor_schema_and_data
_init
()
{
{
- # 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()"
+ # from monitor.functions
+ check_monitor_schema_and_data
+
$MONITORPATH/config.d/init-bootman-sequence.py
}
$MONITORPATH/config.d/init-bootman-sequence.py
}
@@
-247,7
+248,7
@@
case "$1" in
dialog "$MESSAGE"
fi
dialog "$MESSAGE"
fi
- check_monitor_schema_and_data
+ check_monitor_schema_and_data
_init
# create /etc/httpd/conf.d/monitorweb.conf
create_httpd_conf
# create /etc/httpd/conf.d/monitorweb.conf
create_httpd_conf