stack/monitor: prefix monitor sections by monitor-

This prevent naming conflicts in softwares extending and is cleaner.

Also other cleanups:
 - install an interpreter with a prefix, for similar reason
 - list monitor scripts explicitly, so that we don't have collisions
   with other sections installing same eggs (eg. slapos.core)
 - use ${buildout:bin-directory} instead of guessing it

stack/monitor/buildout.cfg

@@ -13,7 +13,7 @@ extends =
 
 parts =
   slapos-cookbook
-  extra-eggs
+  monitor-eggs
   monitor2-template
 
 [monitor-download-base]
@@ -30,7 +30,8 @@ destination = ${buildout:parts-directory}/monitor-scripts
 on-update = true
 
 [monitor-eggs]
-# XXX: merge with extra-eggs?
+recipe = zc.recipe.egg
+interpreter = monitor-pythonwitheggs
 eggs =
   ${lxml-python:egg}
   ${pycurl:egg}
@@ -40,15 +41,17 @@ eggs =
   cns.recipe.symlink
   slapos.toolbox
   slapos.core
-
-[extra-eggs]
-recipe = zc.recipe.egg
-interpreter = pythonwitheggs
-eggs =
-  ${monitor-eggs:eggs}
   psutil
   PyRSS2Gen
   Jinja2
+scripts =
+  monitor.bootstrap
+  monitor.collect
+  monitor.statistic
+  monitor.runpromise
+  monitor.genstatus
+  monitor.configwrite
+  check-free-disk
 
 
 # Monitor templates files
@@ -82,12 +85,12 @@ rendered = ${buildout:directory}/template-monitor.cfg
 context =
     key apache_location apache:location
     key template_logrotate_base template-logrotate-base:rendered
-    raw monitor_bin ${buildout:directory}/bin/monitor.bootstrap
-    raw monitor_collect ${buildout:directory}/bin/monitor.collect
-    raw monitor_statistic ${buildout:directory}/bin/monitor.statistic
-    raw monitor_runpromise ${buildout:directory}/bin/monitor.runpromise
-    raw monitor_genstatus ${buildout:directory}/bin/monitor.genstatus
-    raw monitor_configwrite ${buildout:directory}/bin/monitor.configwrite
+    raw monitor_bin ${buildout:bin-directory}/monitor.bootstrap
+    raw monitor_collect ${buildout:bin-directory}/monitor.collect
+    raw monitor_statistic ${buildout:bin-directory}/monitor.statistic
+    raw monitor_runpromise ${buildout:bin-directory}/monitor.runpromise
+    raw monitor_genstatus ${buildout:bin-directory}/monitor.genstatus
+    raw monitor_configwrite ${buildout:bin-directory}/monitor.configwrite
     raw monitor_conf_template ${monitor-conf:location}/${monitor-conf:filename}
     raw monitor_https_cors ${monitor-httpd-cors:location}/${monitor-httpd-cors:filename}
     raw curl_executable_location ${curl:location}/bin/curl
@@ -97,9 +100,9 @@ context =
     raw monitor_httpd_template ${monitor-httpd-conf:location}/${monitor-httpd-conf:filename}
     raw openssl_executable_location ${openssl:location}/bin/openssl
     raw python_executable ${buildout:executable}
-    raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter}
+    raw python_with_eggs ${buildout:bin-directory}/${monitor-eggs:interpreter}
     raw template_wrapper ${monitor-template-wrapper:location}/${monitor-template-wrapper:filename}
-    raw check_disk_space ${buildout:directory}/bin/check-free-disk
+    raw check_disk_space ${buildout:bin-directory}/check-free-disk
     raw bin_directory ${buildout:directory}/bin
 
 [versions]