slaprunner: do not symlink everything from software_release/bin

The fixes a conflict with 'runner-exporter' due bugs in cns.recipe.symlink

Anyway, a much better idea would be to add ~/software_release/bin to PATH.

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = ec70348dd71b319590a5c5837f3d2e45
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = b20894f378530e79c847ddfb61782cc5
+md5sum = d383fcdb832031aa4bd00bde94901819
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
@@ -26,7 +26,7 @@ md5sum = fc22e2d2f03ce58631f157a5b4943e15
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
-md5sum = 918fb2984cb2ed7afba9200167f98a0f
+md5sum = 9a3adacb4a833b1af3715e7097d31aad
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in

software/slaprunner/instance-runner-import.cfg.in

@@ -19,7 +19,6 @@ parts +=
   runtestsuite
   shellinabox
   shellinabox-service
-  symlinks
   slapos-cfg
   cron-entry-prepare-software
   deploy-instance-parameters

software/slaprunner/instance-runner.cfg

@@ -18,7 +18,6 @@ common-runner-parts =
   runner-sshd-promise
   runner-sshd-service
   runtestsuite
-  symlinks
   shellinabox
   shellinabox-service
   slapos-cfg
@@ -43,8 +42,6 @@ common-runner-parts =
 ## Monitoring part
   monitor-base
   monitor-check-webrunner-internal-instance
-## Usability part
-  template-slapuser-script
 
 parts = $${:common-runner-parts}
 extends =
@@ -214,11 +211,10 @@ default_repository_branch = $${slap-parameter:slapos-reference}
 [slaprunner-supervisord-wrapper]
 recipe = slapos.cookbook:wrapper
 # XXX hardcoded locations
-command-line = $${directory:bin}/slapos node supervisord --cfg $${directory:etc}/slapos.cfg -n
+command-line = $${template-slapuser-script:rendered} node supervisord -n
 wrapper-path = $${directory:services}/slaprunner-supervisord
 hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
 
-
 [test-runner]
 <= slaprunner
 slapos.cfg = $${directory:etc}/slapos-test.cfg
@@ -470,7 +466,7 @@ hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
 
 [gunicorn-graceful]
 recipe = slapos.cookbook:wrapper
-command-line = $${directory:bin}/killpidfromfile $${gunicorn:path_pid} SIGHUP
+command-line = ${buildout:directory}/bin/killpidfromfile $${gunicorn:path_pid} SIGHUP
 wrapper-path = $${directory:scripts}/gunicorn-graceful
 
 #--------------------
@@ -634,11 +630,6 @@ name = runner-sshd.py
 config-hostname = $${slap-network-information:global-ipv6}
 config-port = $${runner-sshd-port:port}
 
-[symlinks]
-recipe = cns.recipe.symlink
-symlink_target = $${directory:bin}
-symlink_base = ${buildout:directory}/bin
-
 [slap-parameter]
 # Default value if no ssh key is specified
 user-authorized-key =
@@ -695,7 +686,7 @@ template = inline:
 
 [shellinabox-service]
 recipe = slapos.cookbook:wrapper
-command-line = $${directory:bin}/shellinaboxd
+command-line = $${shellinabox:rendered}
 wrapper-path = $${directory:services}/shellinaboxd
 hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
 

software/slaprunner/software.cfg

@@ -154,7 +154,6 @@ eggs +=
 
 [versions]
 Flask-Auth = 0.85
-cns.recipe.symlink = 0.2.3
 futures = 3.0.5
 gitdb = 0.6.4
 gunicorn = 19.10.0