Added Certificate autority

slapos/recipe/erp5_promise/__init__.py

@@ -34,13 +34,16 @@ class Recipe(GenericBaseRecipe):
   """
 
   def install(self):
-
     promise_parser = ConfigParser.RawConfigParser()
 
     promise_parser.add_section('portal_templates')
     promise_parser.set('portal_templates', 'repository', self.options['bt5-repository-url'])
     promise_parser.set('portal_templates', 'expected_bt5', self.options['bt5'])
 
+    promise_parser.add_section('portal_certificate_authority')
+    promise_parser.set('portal_certificate_authority', 'certificate_authority_path',
+                                           self.options['certificate-authority-path'])
+
     promise_parser.add_section('external_service')
     promise_parser.set('external_service', 'cloudooo_url', self.options['cloudooo-url'])
     promise_parser.set('external_service', 'memcached_url', self.options['memcached-url'])

software/erp5/instance-tidstorage.cfg.in

@@ -263,6 +263,7 @@ cloudooo-url = {{ slapparameter_dict['cloudooo-url'] }}
 smtp-url = ${slap-parameter:smtp-url}
 bt5 = ${slap-parameter:bt5}
 bt5-repository-url = ${slap-parameter:bt5-repository-url}
+certificate-authority-path = ${erp5-certificate-authority:ca-dir}
 
 #############################
 # ZEO

software/erp5/software.cfg

@@ -120,7 +120,7 @@ extra-context =
 [template-tidstorage]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
-md5sum = c45b6304cfa78c0e677f600bfe34bda3
+md5sum = 1b1e284bebdc723eb64bfc8e0b27ad1a
 mode = 640
 
 [template-cloudooo]