stack/erp5: make cloudooo optional (disabled by default)

stack/erp5/buildout.cfg

@@ -48,7 +48,6 @@ extends =
   ../../component/dash/buildout.cfg
   ../../component/wget/buildout.cfg
   ../../component/aspell/buildout.cfg
-  ../../component/cloudooo/buildout.cfg
   ../../component/jsl/buildout.cfg
   ../../component/6tunnel/buildout.cfg
   ../../component/findutils/buildout.cfg
@@ -115,10 +114,6 @@ parts +=
   ocrb-fonts
   android-fonts
 
-# Cloudooo specific part
-  cloudooo-develop
-  cloudooo
-
 # get git repositories
   erp5
   genbt5list
@@ -234,7 +229,7 @@ recipe = slapos.recipe.template:jinja2
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 rendered = ${buildout:directory}/template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 10d02ec69c875e6a55afe3bf79db7bba
+md5sum = 8b6ad4f9c092cbbd23432797a9020894
 mode = 640
 context =
     key mariadb_link_binary template-mariadb:link-binary
@@ -244,6 +239,7 @@ context =
     key bin_directory buildout:bin-directory
     key buildout_bin_directory buildout:bin-directory
     key cairo_location cairo:location
+    key cloudooo_enable_default erp5-defaults:cloudooo-enable-default
     key coreutils_location coreutils:location
     key cups_location cups:location
     key curl_location curl:location
@@ -252,6 +248,7 @@ context =
     key dbus_glib_location dbus-glib:location
     key dbus_location dbus:location
     key dcron_location dcron:location
+    key default_cloudooo_url erp5-defaults:cloudooo-connection-url
     key erp5_location erp5:location
     key file_location file:location
     key findutils_location findutils:location
@@ -331,7 +328,7 @@ rendered = ${monitor-template-dummy:target}
 [template-erp5]
 <= download-base
 filename = instance-erp5.cfg.in
-md5sum = cb0a8dfc15874939ec786a8b7ac5bff1
+md5sum = 634ef8f3dfce972fee670112a949f09e
 
 [template-zeo]
 <= download-base
@@ -398,6 +395,8 @@ repository_id_list = erp5
 
 # ERP5 defaults, which can be overridden in inheriting recipes (e.g. wendelin)
 [erp5-defaults]
+cloudooo-connection-url = https://cloudooo.erp5.cn/
+cloudooo-enable-default = false
 # Jupyter is by default disabled in ERP5
 jupyter-enable-default = false
 
@@ -602,10 +601,6 @@ scripts = zodbanalyze
 recipe = zc.recipe.egg:develop
 setup = ${erp5:location}
 
-[cloudooo-repository]
-branch =
-revision = 9d3317fc1efaee317af95443121ae30a0596b35c
-
 [slapos-deps-eggs]
 recipe = zc.recipe.egg
 eggs +=
@@ -626,9 +621,6 @@ pysvn = 1.7.10+SlapOSPatched002
 python-ldap = 2.4.27+SlapOSPatched001
 python-magic = 0.4.12+SlapOSPatched001
 
-# specify dev version to be sure that an old released version is not used
-cloudooo = 1.2.5-dev
-
 # use newer version than specified in ZTK
 PasteDeploy = 1.5.2
 Pygments = 2.1.3

stack/erp5/instance-erp5.cfg.in

@@ -7,6 +7,7 @@
 {% set has_posftix = slapparameter_dict.get('smtp', {}).get('postmaster') -%}
 {% set jupyter_dict = slapparameter_dict.get('jupyter', {}) -%}
 {% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default).lower() in ('true', 'yes') -%}
+{% set has_cloudooo = str(cloudooo_enable_default).lower() in ('true', 'yes', '1') -%}
 {% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%}
 [request-common]
 <= request-common-base
@@ -36,7 +37,9 @@ config-{{ k }} = {{ '${' ~ v ~ '}' }}
 
 {{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}) }}
 {{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}) }}
-{{ request('cloudooo', 'cloudooo', 'cloudooo', {'tcpv4-port': 2020}) }}
+{% if has_cloudooo -%}
+{{   request('cloudooo', 'cloudooo', 'cloudooo', {'tcpv4-port': 2020}) }}
+{% endif -%}
 {{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099}, {'database-list': True, 'test-database-list': True}) }}
 {% if has_posftix -%}
 {{   request('smtp', 'postfix', 'smtp', {'tcpv4-port': 2025, 'smtpd-sasl-user': 'erp5@nowhere'}, key_config={'smtpd-sasl-password': 'publish-early:smtpd-sasl-password'}) }}
@@ -132,7 +135,11 @@ return =
 {% endif -%}
 config-bt5 = {{ dumps(slapparameter_dict.get('bt5', bt5_default_list)) }}
 config-bt5-repository-url = {{ dumps(slapparameter_dict.get('bt5-repository-url', local_bt5_repository)) }}
+{% if has_cloudooo -%}
 config-cloudooo-url = ${request-cloudooo:connection-url}
+{% else -%}
+config-cloudooo-url = {{ dumps(default_cloudooo_url) }}
+{% endif -%}
 config-deadlock-debugger-password = ${publish-early:deadlock-debugger-password}
 config-developer-list = {{ dumps(slapparameter_dict.get('developer-list', [inituser_login])) }}
 config-hosts-dict = {{ dumps(slapparameter_dict.get('hosts-dict', {})) }}

stack/erp5/instance.cfg.in

+{% set cloudooo_enabled = str(cloudooo_enable_default).lower() in ('true', 'yes', '1') -%}
 [buildout]
 extends = {{ instance_common_cfg }}
 
@@ -5,6 +6,7 @@ extends = {{ instance_common_cfg }}
 context +=
     raw slapos_core_version {{ slapos_core_version }}
 
+{% if cloudooo_enabled -%}
 [dynamic-template-cloudooo-parameters]
 cairo = {{ cairo_location }}
 cups = {{ cups_location }}
@@ -44,6 +46,7 @@ template = {{ template_cloudooo }}
 filename = instance-cloudoo.cfg
 extra-context =
     section parameter_dict dynamic-template-cloudooo-parameters
+{% endif -%}
 
 [dynamic-template-postfix-parameters]
 bin-directory = {{ bin_directory }}
@@ -64,6 +67,8 @@ extra-context =
     import urllib urllib
 
 [dynamic-template-erp5-parameters]
+cloudooo-enable-default = {{ dumps(cloudooo_enable_default) }}
+default-cloudooo-url =  {{ dumps(default_cloudooo_url) }}
 jupyter-enable-default = {{ jupyter_enable_default }}
 local-bt5-repository = {{ local_bt5_repository }}
 
@@ -72,6 +77,8 @@ local-bt5-repository = {{ local_bt5_repository }}
 template = {{ template_erp5 }}
 filename = instance-erp5.cfg
 extra-context =
+    key cloudooo_enable_default dynamic-template-erp5-parameters:cloudooo-enable-default
+    key default_cloudooo_url dynamic-template-erp5-parameters:default-cloudooo-url
     key jupyter_enable_default dynamic-template-erp5-parameters:jupyter-enable-default
     key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository
     key openssl_location :openssl-location
@@ -199,7 +206,9 @@ create-erp5-site = dynamic-template-create-erp5-site:rendered
 RootSoftwareInstance = ${:default}
 # Internal software types
 kumofs = dynamic-template-kumofs:rendered
+{% if cloudooo_enabled -%}
 cloudooo = dynamic-template-cloudooo:rendered
+{% endif -%}
 mariadb = dynamic-template-mariadb:rendered
 balancer = dynamic-template-balancer:rendered
 postfix = dynamic-template-postfix:rendered