slaprunner: forbid launch of supervisord from supervisorctl.

8c9a97bf · Cédric de Saint Martin · f00963c8 · 8c9a97bf · 8c9a97bf
Commit 8c9a97bf authored Jan 20, 2015 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

software/slaprunner/common.cfg software/slaprunner/common.cfg +1 -1

software/slaprunner/template/slapos.cfg.in software/slaprunner/template/slapos.cfg.in +3 -0

No files found.
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -120,7 +120,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [template-slapos-cfg]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
-md5sum = ca57a8bf1d4da20344fab602a69b807f
+md5sum = e1af7397215fe72712d42e5d5e3120e8
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in
 download-only = true

--- a/software/slaprunner/template/slapos.cfg.in
+++ b/software/slaprunner/template/slapos.cfg.in
@@ -48,3 +48,6 @@ private_key = {{ slaprunner['private_key'] }}

 [gitclient]
 git = {{ slaprunner['git-binary'] }}
+
+[supervisorctl]
+forbid_supervisord_automatic_launch = true