From 5d77e25c6f38497c795176a3e219101ac0445819 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Fri, 28 Sep 2012 16:19:42 +0200 Subject: [PATCH] Added Certificate autority --- slapos/recipe/erp5_promise/__init__.py | 5 ++++- software/erp5/instance-tidstorage.cfg.in | 1 + software/erp5/software.cfg | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/slapos/recipe/erp5_promise/__init__.py b/slapos/recipe/erp5_promise/__init__.py index dec8b1cb5..7b455553a 100644 --- a/slapos/recipe/erp5_promise/__init__.py +++ b/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']) diff --git a/software/erp5/instance-tidstorage.cfg.in b/software/erp5/instance-tidstorage.cfg.in index d4f030774..6f38f88a7 100644 --- a/software/erp5/instance-tidstorage.cfg.in +++ b/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 diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index 4f7f4fc3a..5ba5895cc 100644 --- a/software/erp5/software.cfg +++ b/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] -- 2.30.9