Update Release Candidate

component/babeld/buildout.cfg

@@ -3,8 +3,8 @@ parts = babeld
 
 [babeld]
 recipe = slapos.recipe.cmmi
-url = https://lab.nexedi.com/nexedi/babeld/repository/archive.tar.gz?ref=v1.6.2-nxd1
-md5sum = b7137d7772fa670f4cec39838c4d7b1e
+url = https://lab.nexedi.com/nexedi/babeld/repository/archive.tar.gz?ref=v1.8.4-nxd1
+md5sum = 00fb984503f4fa65de9244226dc11c13
 configure-command =
   echo "No configure.."
 

component/geoip2/buildout.cfg

@@ -17,5 +17,5 @@ rpath = ${:library-dirs}
 [geolite2-country]
 recipe = slapos.recipe.build:download-unpacked
 url = http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz#${:md5sum}
-md5sum = 3ae76aa88be4401923acc3acf34e0faf
+md5sum = 5dda13a7af3044a1791992712e377252
 strip-top-level-dir = true

component/openvpn/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 [openvpn]
 recipe = slapos.recipe.cmmi
 url = https://swupdate.openvpn.org/community/releases/openvpn-${:version}.tar.xz
-version = 2.3.18
-md5sum = 844ec9c64aae62051478784b8562f881
+version = 2.4.7
+md5sum = 4ad8a008e1e7f261b3aa0024e79e7fb7
 configure-options =
   --disable-dependency-tracking
   --disable-plugin-auth-pam
@@ -20,9 +20,7 @@ environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
   LZO_LIBS=-L${lzo:location}/lib -llzo2
   LZO_CFLAGS=-I${lzo:location}/include
-  OPENSSL_SSL_LIBS=-L${openssl:location}/lib -lssl
-  OPENSSL_SSL_CFLAGS=-I${openssl:location}/include
-  OPENSSL_CRYPTO_LIBS=-L${openssl:location}/lib -lcrypto
-  OPENSSL_CRYPTO_CFLAGS=-I${openssl:location}/include
+  OPENSSL_LIBS=-L${openssl:location}/lib -lcrypto -lssl
+  OPENSSL_CFLAGS=-I${openssl:location}/include
   LDFLAGS =-Wl,-rpath=${lzo:location}/lib -Wl,-rpath=${flex:location}/lib -Wl,-rpath=${openssl:location}/lib
   CPPFLAGS=-I${lzo:location}/include -I${flex:location}/include

software/caddy-frontend/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 6fd023f0d29421d8579f0b3351473bb0
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 86f15c85054800a55a7093d37b03cdce
+md5sum = 15d6b5b00ab1f74d42863c90f2537981
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
@@ -38,7 +38,7 @@ md5sum = 54ae95597a126ae552c3a913ddf29e5e
 
 [template-replicate-publish-slave-information]
 filename = templates/replicate-publish-slave-information.cfg.in
-md5sum = 01efde8febafcff6dde2ebb43e75a9e4
+md5sum = 73e3d1e55a98a3c4d25a1618aa584fff
 
 [template-caddy-frontend-configuration]
 filename = templates/Caddyfile.in

software/caddy-frontend/instance-apache-replicate.cfg.in

@@ -223,6 +223,13 @@ custom-group = ${dynamic-publish-slave-information:rendered}
 {{ frontend_section }} = {{ "${%s:connection-slave-instance-information-list}" % frontend_section }}
 {% endfor %}
 
+[active-slave-instance]
+{% for slave_instance in slave_instance_list %}
+{# Provide a list of slave titles send by master, in order to filter out already destroyed slaves #}
+{# Note: This functionality is not yet covered by tests, please modify with care #}
+{{ slave_instance['slave_title'] }} = active
+{% endfor %}
+
 [dynamic-publish-slave-information]
 < = jinja2-template-base
 template = {{ template_publish_slave_information }}
@@ -231,6 +238,7 @@ extensions = jinja2.ext.do
 extra-context =
     section slave_information slave-information
     section rejected_slave_information rejected-slave-information
+    section active_slave_instance_dict active-slave-instance
 
 [monitor-conf-parameters]
 monitor-url-list +=

software/caddy-frontend/templates/replicate-publish-slave-information.cfg.in

@@ -36,18 +36,22 @@
 
 # Publish information for each slave
 {% for slave_reference, slave_information in slave_information_dict.iteritems() %}
-{%   set publish_section_title = 'publish-%s' % slave_reference %}
-{%   do part_list.append(publish_section_title) %}
+{#   Filter out destroyed, so not existing anymore, slaves #}
+{#   Note: This functionality is not yet covered by tests, please modify with care #}
+{%   if slave_reference in active_slave_instance_dict %}
+{%     set publish_section_title = 'publish-%s' % slave_reference %}
+{%     do part_list.append(publish_section_title) %}
 [{{ publish_section_title }}]
 recipe = slapos.cookbook:publish
 -slave-reference = {{ slave_reference }}
-{% set log_access_url = slave_information.pop('log-access-urls', None) %}
-{% if log_access_url %}
+{%     set log_access_url = slave_information.pop('log-access-urls', None) %}
+{%     if log_access_url %}
 log-access-url = {{ dumps(json_module.dumps(log_access_url)) }}
-{% endif %}
-{%   for key, value in slave_information.iteritems() %}
+{%     endif %}
+{%     for key, value in slave_information.iteritems() %}
 {{ key }} = {{ dumps(value) }}
-{%   endfor %}
+{%     endfor %}
+{%   endif %}
 {% endfor %}
 
 [buildout]