Merge remote-tracking branch 'origin/master' into erp5-component

component/kumo/buildout.cfg

@@ -22,12 +22,21 @@ filename = kumofs-0.4.13_ipv6support_multiiplistenfix.patch
 md5sum = 53af9f1f1375940841c589a6cbe11425
 download-only = true
 
+[kumo-gcc-4.9-ftbfs-download]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = kumofs-0.4.13_fix_gcc-4.9_ftbfs.patch
+md5sum = c09e04c620ce11c3fdd4afc3459cd355
+download-only = true
+
 [kumo]
 pre-configure-hook = ${kumo-hooks-download:location}/${kumo-hooks-download:filename}:pre_configure_hook
 recipe = erp5.recipe.cmmiforcei686
 url = https://github.com/downloads/etolabo/kumofs/kumofs-0.4.13.tar.gz
 md5sum = 46148e9536222d0ad2ef36777c55714d
-patches = ${kumo-ipv6-multiip-patch-download:location}/${kumo-ipv6-multiip-patch-download:filename}
+patches =
+  ${kumo-ipv6-multiip-patch-download:location}/${kumo-ipv6-multiip-patch-download:filename}
+  ${kumo-gcc-4.9-ftbfs-download:location}/${kumo-gcc-4.9-ftbfs-download:filename}
 patch-options = -p1
 configure-options =
   --enable-tcadb

component/kumo/kumofs-0.4.13_fix_gcc-4.9_ftbfs.patch

+--- kumofs-0.4.13/src/logic/gateway/mod_store.cc	2010-12-14 12:42:27.000000000 +0900
++++ kumofs-0.4.13/src/logic/gateway/mod_store.cc	2014-07-24 09:56:52.445251606 +0900
+@@ -262,19 +262,19 @@
+ #define GATEWAY_CATCH(NAME, response_type) \
+ catch (msgpack::type_error& e) { \
+ 	LOG_ERROR(#NAME " FAILED: type error"); \
+-	response_type res; \
+-	res.error = 1; \
+-	try { (*callback)(user, res, z); } catch (...) { } \
++	response_type r; \
++	r.error = 1; \
++	try { (*callback)(user, r, z); } catch (...) { } \
+ } catch (std::exception& e) { \
+ 	LOG_WARN(#NAME " FAILED: ",e.what()); \
+-	response_type res; \
+-	res.error = 1; \
+-	try { (*callback)(user, res, z); } catch (...) { } \
++	response_type r; \
++	r.error = 1; \
++	try { (*callback)(user, r, z); } catch (...) { } \
+ } catch (...) { \
+ 	LOG_WARN(#NAME " FAILED: unknown error"); \
+-	response_type res; \
+-	res.error = 1; \
+-	try { (*callback)(user, res, z); } catch (...) { } \
++	response_type r; \
++	r.error = 1; \
++	try { (*callback)(user, r, z); } catch (...) { } \
+ }
+ 
+ 

software/apache-frontend/common.cfg

@@ -67,7 +67,7 @@ mode = 0644
 [template-apache-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg
-md5sum = 5388e77d520135b7491f1aeddac5f4e0
+md5sum = 986988ed3a357f87fc023e14d87dcc5c
 output = ${buildout:directory}/template-apache-frontend.cfg
 mode = 0644
 
@@ -80,7 +80,7 @@ mode = 0644
 [template-slave-list]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in
-md5sum = c896e60c95ca387a75a163d817155d98
+md5sum = 1c2a47e7e2aa58b4f350ed29ab1a98fe
 mode = 640
 
 [template-slave-configuration]

software/apache-frontend/instance-apache-frontend.cfg

@@ -175,7 +175,7 @@ extra-context =
     section logrotate_dict logrotate
     section frontend_configuration frontend-configuration
     section apache_configuration apache-configuration
-    section connection_information_dict publish-connection-informations
+    key monitor_url monitor-parameters:url
 
 [dynamic-custom-group-template-slave-list]
 < = jinja2-template-base

software/apache-frontend/templates/apache-custom-slave-list.cfg.in

@@ -237,10 +237,7 @@ private-ipv4 = {{ local_ipv4 }}
 {% if extra_slave_instance_list -%}
 slave-instance-information-list = {{ json_module.dumps(slave_instance_information_list) }}
 {% endif -%}
-{% do connection_information_dict.pop('recipe') %}
-{% for key, value in connection_information_dict.iteritems() -%}
-{{ key }} = {{ value }}
-{% endfor %}
+monitor_url = {{ monitor_url }}
 
 {% do part_list.append('cached-rewrite-rules') -%}
 [cached-rewrite-rules]