From 1c542abc5e4388161974ac54941ff3dca3df9cda Mon Sep 17 00:00:00 2001 From: Jondy Zhao <jondy.zhao@gmail.com> Date: Sun, 30 Jun 2013 18:00:48 +0800 Subject: [PATCH] Fix netdrive-reporter couldn't create script --- software/netdrive-reporter/instance.cfg.in | 17 +++++++++-------- software/netdrive-reporter/software.cfg | 11 +++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/software/netdrive-reporter/instance.cfg.in b/software/netdrive-reporter/instance.cfg.in index 60ad08525..e8b1a8a49 100644 --- a/software/netdrive-reporter/instance.cfg.in +++ b/software/netdrive-reporter/instance.cfg.in @@ -1,7 +1,7 @@ [buildout] parts = directory - reporter + main publish-connection-parameter eggs-directory = ${buildout:eggs-directory} @@ -16,7 +16,7 @@ url = $${slap_connection:server_url} key = $${slap_connection:key_file} cert = $${slap_connection:cert_file} -configuration.name = anonymous +configuration.name = Anonymous [directory] recipe = slapos.cookbook:mkdirectory @@ -24,19 +24,20 @@ etc = $${buildout:directory}/etc script = $${:etc}/run service = $${:etc}/service promise = $${:etc}/promise +report = $${buildout:directory}/var/xml_report [main] recipe = slapos.cookbook:wrapper -command-line = ${buildout:bin-directory}/netdrive_reporter +command-line = ${buildout:bin-directory}/netdrive-reporter --master-url=$${instance-parameter:url} - --computer-id=$${instance-parameter:computer} - --cert-file=$${instance-parameter:cert} - --key-file=$${instance-parameter:key} - --report-interval=300 + --computer-id=$${instance-parameter:computer} + --cert-file=$${instance-parameter:cert} + --key-file=$${instance-parameter:key} + --report-path=$${directory:report} + --report-interval=300.0 --data-file=$${directory:etc}/data wrapper-path = $${directory:service}/netdrive-reporter [publish-connection-parameter] recipe = slapos.cookbook:publish name = Net Drive Usage Report -- $${instance-parameter:configuration.name}! - diff --git a/software/netdrive-reporter/software.cfg b/software/netdrive-reporter/software.cfg index 0a6d1bd00..0c11be104 100644 --- a/software/netdrive-reporter/software.cfg +++ b/software/netdrive-reporter/software.cfg @@ -7,16 +7,15 @@ parts = netdrive-usage-report instance-template +download-cache = /opt/download-cache + [netdrive-usage-report] -recipe = z3c.recipe.scripts +recipe = zc.recipe.egg eggs = slapos.core lxml - netdrive.report - -# control scripts generation in order to avoid reinstalling bin/buildout -scripts = - netdrive_reporter = netreport:main + zc.buildout + netdrive [instance-template] recipe = slapos.recipe.template -- 2.30.9