Merge branch 'master' into 1.0

component/qemu-kvm/buildout.cfg

@@ -43,9 +43,9 @@ environment =
 [debian-amd64-netinst.iso]
 # Download the installer of Debian 8 (Jessie)
 recipe = hexagonit.recipe.download
-url = http://cdimage.debian.org/debian-cd/8.3.0/amd64/iso-cd/debian-8.3.0-amd64-netinst.iso
+url = http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-cd/debian-8.4.0-amd64-netinst.iso
 filename = ${:_buildout_section_name_}
-md5sum = a9b490b4215d1e72e876b031dafa7184
+md5sum = 8d52d1b7789cd5a464aae719f05299ec
 download-only = true
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

software/slaprunner/common.cfg

@@ -106,7 +106,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/nginx_conf.in
 download-only = true
-md5sum = 2ccfb122a6e8e4cce0d98e9db28be749
+md5sum = e6c2e1dd2153afefa0805c4065066e4e
 filename = nginx_conf.in
 mode = 0644
 

software/slaprunner/nginx_conf.in

@@ -25,7 +25,7 @@ http {
         ssl_certificate     {{ param_nginx_frontend['ssl-certificate'] }};
         ssl_certificate_key {{ param_nginx_frontend['ssl-key'] }};
         ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-        ssl_ciphers         ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+        ssl_ciphers         ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5;
         ssl_prefer_server_ciphers on;
         keepalive_timeout 90s;
         client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};

stack/monitor/buildout.cfg

@@ -71,7 +71,7 @@ md5sum = 5913d2a0096b50537f394a49b762b3e5
 [monitor-template-wrapper]
 <= monitor-template-base
 filename = wrapper.in
-md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
+md5sum = 1695c9a06a2b11ccfe893d7a224e489d
 
 [monitor-conf]
 <= monitor-template-base
@@ -99,7 +99,7 @@ recipe = slapos.recipe.template:jinja2
 filename = template-monitor.cfg
 template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
 rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = b8c804aba89a3938aa00bed914b1729a
+md5sum = eab45fd2b0f017ab97a9c8f466c8dceb
 context =
     key apache_location apache:location
     key gzip_location gzip:location
@@ -173,4 +173,3 @@ url = ${:_profile_base_location_}/make-rss.sh.in
 md5sum = 98c8f6fd81e405b0ad10db07c3776321
 output = ${buildout:directory}/template-make-rss.sh.in
 mode = 0644
-

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -269,6 +269,7 @@ rendered = ${directory:scripts}/monitor-httpd-graceful
 mode = 0700
 context =
     key content :command
+    raw dash_binary {{ dash_executable_location }}
 command = kill -USR1 $(cat ${monitor-httpd-conf-parameter:pid-file})
 
 [monitor-status2rss-wrapper]

stack/monitor/templates/wrapper.in

-#!${dash-output:dash}
+#!{{ dash_binary }}
 {{ content }}
\ No newline at end of file