Skip to content

slapos
slapos
Commit c3794124 authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

certificate authority: move instance.cfg from sr to the stack 

certificate-authority software release and stack was renamed to caucase
parent d604ad6a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 164 additions and 157 deletions
software/caucase/software.cfg 0 → 100644
View file @ c3794124
[buildout]
extends =
../../stack/caucase/buildout.cfg
../../stack/slapos.cfg
parts =
slapos-cookbook
extra-eggs
instance-caucase
software/certificate-authority/instance.cfg.in deleted 100644 → 0
View file @ d604ad6a
[buildout]
parts =
publish-connection-parameter
extends =
{{ certificate_authority_template }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[publish-connection-parameter]
recipe = slapos.cookbook:publish.serialised
http-url = ${certificate-authority-server:insecure-url}
https-url = ${certificate-authority-server:url}
\ No newline at end of file
software/certificate-authority/software.cfg deleted 100644 → 0
View file @ d604ad6a
[buildout]
extends =
../../stack/certificate-authority/buildout.cfg
../../stack/slapos.cfg
parts =
slapos-cookbook
extra-eggs
template
[template]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg.in
rendered = ${buildout:directory}/template.cfg
mode = 0644
md5sum = c61a8f951e99002753c3a53d0a18b16d
context =
key bin_directory buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key certificate_authority_template template-certificate-authority:rendered
stack/certificate-authority/buildout.cfg → stack/caucase/buildout.cfg
View file @ c3794124
...@@ -7,11 +7,12 @@ extends = ...@@ -7,11 +7,12 @@ extends =
../../component/curl/buildout.cfg ../../component/curl/buildout.cfg
../../component/dash/buildout.cfg ../../component/dash/buildout.cfg
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
../../component/bcrypt/buildout.cfg
../../stack/logrotate/buildout.cfg ../../stack/logrotate/buildout.cfg
parts = parts =
template-logrotate-base instance-caucase
[extra-eggs] [extra-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -20,9 +21,17 @@ eggs = ...@@ -20,9 +21,17 @@ eggs =
gunicorn # for WSGI HTTP Server gunicorn # for WSGI HTTP Server
futures futures
caucase # certificate authority caucase # certificate authority
${bcrypt:egg}
# are also required # are also required
plone.recipe.command plone.recipe.command
collective.recipe.template collective.recipe.template
slapos.toolbox
scripts =
slapos-kill
gunicorn
caucase
caucase-cli
caucase-cliweb
[template-ca-download-base] [template-ca-download-base]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
...@@ -37,6 +46,10 @@ mode = 0644 ...@@ -37,6 +46,10 @@ mode = 0644
[template-nginx-ca-conf] [template-nginx-ca-conf]
<= template-ca-download-base <= template-ca-download-base
[template-caucase]
<= template-ca-download-base
url = ${:_profile_base_location_}/${:filename}
[template-authenticated-server] [template-authenticated-server]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:filename} template = ${:_profile_base_location_}/${:filename}
...@@ -44,7 +57,7 @@ rendered = ${buildout:directory}/template-authenticated-server.cfg ...@@ -44,7 +57,7 @@ rendered = ${buildout:directory}/template-authenticated-server.cfg
context = context =
key apache_location apache:location key apache_location apache:location
key template_logrotate_base template-logrotate-base:rendered key template_logrotate_base template-logrotate-base:rendered
raw certificate_request_bin ${buildout:directory}/bin/ca-cliweb raw certificate_request_bin ${buildout:directory}/bin/caucase-cliweb
raw curl_executable_location ${curl:location}/bin/curl raw curl_executable_location ${curl:location}/bin/curl
raw dash_executable_location ${dash:location}/bin/dash raw dash_executable_location ${dash:location}/bin/dash
raw slapos_kill_bin ${buildout:directory}/bin/slapos-kill raw slapos_kill_bin ${buildout:directory}/bin/slapos-kill
...@@ -52,16 +65,19 @@ context = ...@@ -52,16 +65,19 @@ context =
raw openssl_executable_location ${openssl:location}/bin/openssl raw openssl_executable_location ${openssl:location}/bin/openssl
raw python_bin ${buildout:directory}/bin/${extra-eggs:interpreter} raw python_bin ${buildout:directory}/bin/${extra-eggs:interpreter}
[template-certificate-authority] [instance-caucase]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:filename} template = ${:_profile_base_location_}/${:filename}
rendered = ${buildout:directory}/template-certificate-authority.cfg rendered = ${buildout:directory}/template.cfg
context = context =
key ngix_location nginx:location key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key nginx_location nginx:location
key template_logrotate_base template-logrotate-base:rendered key template_logrotate_base template-logrotate-base:rendered
raw caucase_template ${template-caucase:location}/${template-caucase:filename}
raw curl_executable_location ${curl:location}/bin/curl raw curl_executable_location ${curl:location}/bin/curl
raw certificate_authority_bin ${buildout:directory}/bin/ca-bin raw caucase_bin ${buildout:directory}/bin/caucase
raw certificate_request_bin ${buildout:directory}/bin/ca-cliweb raw certificate_request_bin ${buildout:directory}/bin/caucase-cliweb
raw template_nginx_ca_conf ${template-nginx-ca-conf:location}/${template-nginx-ca-conf:filename} raw template_nginx_ca_conf ${template-nginx-ca-conf:location}/${template-nginx-ca-conf:filename}
raw dash_executable_location ${dash:location}/bin/dash raw dash_executable_location ${dash:location}/bin/dash
raw slapos_kill_bin ${buildout:directory}/bin/slapos-kill raw slapos_kill_bin ${buildout:directory}/bin/slapos-kill
...@@ -69,10 +85,11 @@ context = ...@@ -69,10 +85,11 @@ context =
raw openssl_executable_location ${openssl:location}/bin/openssl raw openssl_executable_location ${openssl:location}/bin/openssl
raw python_bin ${buildout:directory}/bin/${extra-eggs:interpreter} raw python_bin ${buildout:directory}/bin/${extra-eggs:interpreter}
[versions] [versions]
Flask-User = 0.6.11 Flask-User = 0.6.11
SQLAlchemy = 1.1.9 SQLAlchemy = 1.1.9
caucase = 0.1.1 caucase = 0.1.2
futures = 3.1.1 futures = 3.1.1
gunicorn = 19.7.1 gunicorn = 19.7.1
slapos.recipe.template = 2.10 slapos.recipe.template = 2.10
......
stack/certificate-authority/buildout.hash.cfg → stack/caucase/buildout.hash.cfg
View file @ c3794124
...@@ -26,6 +26,10 @@ md5sum = d8bebf1629aacffd619541f363687b4a ...@@ -26,6 +26,10 @@ md5sum = d8bebf1629aacffd619541f363687b4a
filename = instance-auth-server.cfg.jinja2.in filename = instance-auth-server.cfg.jinja2.in
md5sum = a317d2f948cd3d16c860d05cc07ecf42 md5sum = a317d2f948cd3d16c860d05cc07ecf42
[template-certificate-authority] [template-caucase]
filename = instance-certificate-authority.cfg.jinja2.in filename = instance-caucase.cfg.jinja2.in
md5sum = 5ed16bcece904dd4527210c7453c84ca md5sum = b801dfe4212ff97dc29191e4610df3a3
[instance-caucase]
filename = instance.cfg.in
md5sum = eb9d2ab646717d123b0472da5194d77f
stack/caucase/instance.cfg.in 0 → 100644
View file @ c3794124
[buildout]
parts =
switch-softwaretype
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised
computer = ${slap-connection:computer-id}
partition = ${slap-connection:partition-id}
url = ${slap-connection:server-url}
key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file}
[dynamic-template-caucase]
recipe = slapos.recipe.template:jinja2
filename = ${:_buildout_section_name_}.cfg
rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
template = {{ caucase_template }}
extensions = jinja2.ext.do
extra-context =
context =
key ipv4 slap-configuration:ipv4
key ipv6 slap-configuration:ipv6
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key slapparameter_dict slap-configuration:configuration
raw gunicorn_bin {{ gunicorn_bin }}
raw template_logrotate_base {{ template_logrotate_base }}
raw certificate_request_bin {{ certificate_request_bin }}
raw template_nginx_ca_conf {{ template_nginx_ca_conf }}
raw nginx_location {{ nginx_location }}
raw slapos_kill_bin {{ slapos_kill_bin }}
raw dash_executable_location {{ dash_executable_location }}
raw curl_executable_location {{ curl_executable_location }}
raw publish_parameter yes
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${dynamic-template-caucase:rendered}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7