Merge branch 'master' into fluent-bit

software/beremiz-runtime/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = ed202dc7d69f517e325f01dc3ac4fe32
+md5sum = 6e3e1dc304378640707cdb6a792106f1

software/beremiz-runtime/instance.cfg.in

@@ -5,27 +5,20 @@
 #############################
 [buildout]
 parts =
-  directory
   publish-connection-parameter
   download-plc
   beremiz-runtime
-#  beremiz-runtime-promise
+#beremiz-runtime-promise
 
 eggs-directory = {{ buildout['eggs-directory'] }}
 develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
 offline = true
 extends = {{ template_monitor }}
 
-
 [download-plc]
-recipe = plone.recipe.command
-update-command = ${:command}
+recipe = slapos.recipe.build:download-unpacked
+offline = false
 url = ${instance-parameter:configuration.runtime_plc_url}
-md5sum = ${instance-parameter:configuration.runtime_plc_md5sum}
-# XXX:  do check md5sum !
-command = 
-  wget ${:url} -O plc.tgz
-  tar zxvf plc.tgz 
 
 [instance-parameter]
 recipe = slapos.cookbook:slapconfiguration
@@ -36,13 +29,9 @@ key = ${slap-connection:key-file}
 cert = ${slap-connection:cert-file}
 configuration.runtime_plc_url =
 configuration.runtime_plc_md5sum =
-# XXX: we can get rid of plc_name in future
-configuration.runtime_plc_name = 
 configuration.autostart = 1
 configuration.interface = 0.0.0.0
-# XXX: randomly generated one on slap's interface?
 configuration.port = 61248
-configuration.plc_runtime_path = ${directory:home}/${:configuration.runtime_plc_name}
 
 # Create all needed directories, depending on your needs
 [directory]
@@ -50,7 +39,7 @@ recipe = slapos.cookbook:mkdirectory
 home = ${buildout:directory}
 etc = ${:home}/etc
 var = ${:home}/var
-script = ${:etc}/run/
+script = ${:etc}/run
 service = ${:etc}/service
 log = ${:var}/log
 
@@ -58,7 +47,7 @@ log = ${:var}/log
 logfile = ${directory:log}/beremiz-runtime.log
 recipe = slapos.cookbook:wrapper
 command-line =
-    {{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/src/beremiz/Beremiz_service.py -a ${instance-parameter:configuration.autostart} -p ${instance-parameter:configuration.port} -i ${instance-parameter:configuration.interface} -x 1 ${directory:home}/${instance-parameter:configuration.runtime_plc_name}
+    {{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/parts/beremiz-source/Beremiz_service.py -a ${instance-parameter:configuration.autostart} -p ${instance-parameter:configuration.port} -i ${instance-parameter:configuration.interface} -x 1 ${directory:home}/parts/download-plc
 wrapper-path = ${directory:service}/beremiz-runtime
 
 [beremiz-runtime-promise]

software/beremiz-runtime/software.cfg

-# the default SlapOs profile which setup a modbus server instance usually over OSIE's coupler
 [buildout]
-allow-picked-versions = true
-extensions = mr.developer
-auto-checkout = beremiz
 extends =
   buildout.hash.cfg
-  https://lab.nexedi.com/nexedi/slapos/raw/master/stack/monitor/buildout.cfg
-  https://lab.nexedi.com/nexedi/slapos/raw/master/stack/slapos.cfg
-  https://lab.nexedi.com/nexedi/slapos/raw/master/component/python3/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../stack/monitor/buildout.cfg
+  ../../stack/slapos.cfg
 
 parts = 
-  python-interpreter
+  beremiz-source
   slapos-cookbook
   instance-profile
+  python-interpreter
 
-# fix for pypi: https://mail.python.org/pipermail/distutils-sig/2017-October/031712.html
-index = https://pypi.python.org/simple/
-
-[sources]
-beremiz = git https://github.com/beremiz/beremiz.git branch=default
+[beremiz-source]
+recipe = slapos.recipe.build:gitclone
+repository = https://github.com/beremiz/beremiz.git
+branch = default
+git-executable = ${git:location}/bin/git
 
 [beremiz]
 recipe  = zc.recipe.egg:develop
 egg     = beremiz
-setup   = ${buildout:directory}/src/beremiz
+setup   = ${beremiz-source:location}
 
 [Twisted]
 recipe  = zc.recipe.egg:custom
@@ -31,6 +28,7 @@ egg     =  Twisted
 setup-eggs =
     six
     pathlib
+    incremental
 
 [python-interpreter]
 recipe = zc.recipe.egg
@@ -53,7 +51,6 @@ eggs = click
 [instance-profile]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}
-mode = 0644
 rendered = ${buildout:directory}/instance.cfg
 extensions = jinja2.ext.do
 context =
@@ -95,4 +92,3 @@ typing = 3.10.0.0
 autobahn = 19.11.2
 txaio = 18.8.1
 idna = 2.10
-mr.developer = 2.0.1