Commit b4f241b6 authored by Rafael Monnerat's avatar Rafael Monnerat

Update release candidate

parents a03a38e0 445daede
......@@ -3,10 +3,12 @@ TestRe6stVerificationUrlDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid
TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_graceful_signature
TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_graceful_signature.tmp
TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature
TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature.status
TestRe6stVerificationUrlDefaultSlave-1/var/run/httpd.pid
TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor-httpd.pid
TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid
TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx.pid
TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_graceful_signature
TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_graceful_signature.tmp
TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_validate_signature
\ No newline at end of file
TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_validate_signature
TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file
......@@ -3,10 +3,12 @@ TestRe6stVerificationUrlSlave-0/var/run/monitor/monitor-bootstrap.pid
TestRe6stVerificationUrlSlave-1/var/run/caddy_graceful_signature
TestRe6stVerificationUrlSlave-1/var/run/caddy_graceful_signature.tmp
TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature
TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature.status
TestRe6stVerificationUrlSlave-1/var/run/httpd.pid
TestRe6stVerificationUrlSlave-1/var/run/monitor-httpd.pid
TestRe6stVerificationUrlSlave-1/var/run/monitor/monitor-bootstrap.pid
TestRe6stVerificationUrlSlave-1/var/run/nginx.pid
TestRe6stVerificationUrlSlave-1/var/run/nginx_graceful_signature
TestRe6stVerificationUrlSlave-1/var/run/nginx_graceful_signature.tmp
TestRe6stVerificationUrlSlave-1/var/run/nginx_validate_signature
\ No newline at end of file
TestRe6stVerificationUrlSlave-1/var/run/nginx_validate_signature
TestRe6stVerificationUrlSlave-1/var/run/nginx_validate_signature.status
......@@ -15,5 +15,5 @@
[template]
filename = instance.cfg
md5sum = f27dd22ce5b925dd81f2fcd988b10691
md5sum = 2af05c83ea9525ac3c6816ee0365876c
......@@ -84,6 +84,7 @@ command-line =
environment =
PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random}
LOCAL_IPV6=$${slap-configuration:ipv6-random}
[phantomjs-wrapper]
......
......@@ -82,7 +82,7 @@ md5sum = f9151066df96527d4c7f75c3079b2c10
[template-zope]
filename = instance-zope.cfg.in
md5sum = b513678ffccb927d147fc4e0dda30dd5
md5sum = ac26b478d353ce76cdad137e04e34217
[template-balancer]
filename = instance-balancer.cfg.in
......
......@@ -115,7 +115,7 @@ ca-crl = ${:ca-dir}/crl
# Generate rdiff exclude file
recipe = slapos.recipe.template:jinja2
mode = 644
template = {{ 'inline:{{ "${directory:log}/**\\n" }}' }}
template = {{ 'inline:{{ "${directory:log}/**\\n${directory:tmp}/**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
[{{ section("resiliency-identity-signature-script")}}]
......
......@@ -135,7 +135,7 @@ pytz = 2016.10
requests = 2.13.0
six = 1.11.0
slapos.cookbook = 1.0.75
slapos.core = 1.4.14
slapos.core = 1.4.15
slapos.extension.strip = 0.4
slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.16
......@@ -149,7 +149,7 @@ xml-marshaller = 0.9.7
paramiko = 2.1.3
# Required by:
# slapos.core==1.4.13
# slapos.core==1.4.15
Flask = 0.12
# Required by:
......@@ -217,7 +217,7 @@ jsonschema = 3.0.0a3
lockfile = 0.12.2
# Required by:
# slapos.core==1.4.13
# slapos.core==1.4.15
# XXX 'slapos node format' raises an exception with netifaces 0.10.5.
netifaces = 0.10.4
......@@ -246,15 +246,15 @@ python-dateutil = 2.7.3
rpdb = 0.1.5
# Required by:
# slapos.core==1.4.13
# slapos.core==1.4.15
supervisor = 3.3.3
# Required by:
# slapos.core==1.4.13
# slapos.core==1.4.15
uritemplate = 3.0.0
# Required by:
# slapos.core==1.4.13
# slapos.core==1.4.15
zope.interface = 4.3.3
[networkcache]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment