Various updates; Add logAxis patch for graphite; Add namespaces to summary scripts.

[myops.git] / web / db-config.d / 030-conf_files_myops

diff --git a/web/db-config.d/030-conf_files_myops b/web/db-config.d/030-conf_files_myops
index b83eed7..a80cd11 100644 (file)
--- a/web/db-config.d/030-conf_files_myops
+++ b/web/db-config.d/030-conf_files_myops
@@ -10,7 +10,6 @@ conf_files = [
        'file_group': u'root',
        'file_owner': u'root',
        'file_permissions': u'755',
-       'preinstall_cmd': u' if ! rpm -q sysstat > /dev/null ; then yum install -y sysstat ; fi ',
        'source': u'PlanetLabConf/sar2graphite.py'},
 {'dest': u'/etc/cron.d/sysstat',
        'always_update': False,
@@ -20,17 +19,17 @@ conf_files = [
        'file_permissions': u'644',
        'source': 'PlanetLabConf/sysstat.cron'},
 
-{'dest': "/home/%s_myops/bootstrap.tar" % plc['slice_prefix'],
+{'dest': "/usr/bin/myops_update.sh",
        'always_update': False,
        'enabled': True,
        'file_group': u'root',
        'file_owner': u'root',
-       'file_permissions': u'644',
-       'source': 'PlanetLabConf/bootstrap.tar',
-       'preinstall_cmd': ' mkdir -p /home/%s_myops/ ' % plc['slice_prefix'],
-       'postinstall_cmd': ' cd /home/%s_myops/ ; tar -xvf bootstrap.tar ; chmod 755 ./*.sh ./lshw ; ./bootstrap.sh ' % plc['slice_prefix']},
+       'file_permissions': u'755',
+       'source': 'PlanetLabConf/myops_update_sh',
+       'preinstall_cmd': '',
+       'postinstall_cmd': 'if [ ! -f /home/%s_myops/update_ok ] ; then /usr/bin/myops_update.sh ; fi ' % plc['slice_prefix'] },
 
-    ]
+]
 
 for conf_file in conf_files:
        SetConfFile(conf_file)