diff --git a/software/postgres/instance.cfg.in b/software/postgres/instance.cfg.in index e5397dfbd5a7c041cc586fe34cf5f4759bd4e6a2..3d174e076c3be91c8096c4be08eb24cd2df8d3b1 100644 --- a/software/postgres/instance.cfg.in +++ b/software/postgres/instance.cfg.in @@ -3,6 +3,7 @@ parts = symlinks publish postgres-instance + postgres-promise # Define egg directories to be the one from Software Release @@ -12,22 +13,12 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} offline = true -[instance-parameters] -# Fetches parameters defined in SlapOS Master for this instance -recipe = slapos.cookbook:slapconfiguration -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} - - [directories] recipe = slapos.cookbook:mkdirectory bin = $${buildout:directory}/bin etc = $${buildout:directory}/etc -services = $${directories:etc}/run/ -promises = $${directories:etc}/promise/ +services = $${directories:etc}/service +promises = $${directories:etc}/promise var = $${buildout:directory}/var @@ -37,8 +28,11 @@ symlink_target = $${directories:bin} symlink_base = ${postgresql:location}/bin +#---------------- +#-- +#-- Creates a Postgres cluster, configuration files, and a database. + [postgres-instance] -# create cluster, configuration files and a database recipe = slapos.cookbook:postgres # Options @@ -54,17 +48,36 @@ bin = $${directories:bin} services = $${directories:services} +#---------------- +#-- +#-- Deploy promise scripts. + +[postgres-promise] +recipe = slapos.cookbook:check_port_listening +path = $${directories:promises}/postgres +hostname = $${instance-parameters:ipv6_random} +port = $${postgres-instance:port} + + +#---------------- +#-- +#-- Publish instance parameters. + [publish] -recipe = slapos.cookbook:publishurl +recipe = slapos.cookbook:publish url = $${postgres-instance:url} -[slap-connection] -# part to migrate to new - separated words -computer-id = $${slap_connection:computer_id} -partition-id = $${slap_connection:partition_id} -server-url = $${slap_connection:server_url} -software-release-url = $${slap_connection:software_release_url} -key-file = $${slap_connection:key_file} -cert-file = $${slap_connection:cert_file} +#---------------- +#-- +#-- Fetches parameters defined in SlapOS Master for this instance + +[instance-parameters] +# Fetches parameters defined in SlapOS Master for this instance +recipe = slapos.cookbook:slapconfiguration +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} diff --git a/software/postgres/software.cfg b/software/postgres/software.cfg index 1bdf0eb311eab272931cf82b8ed19b31955a4971..636a85bf3baff082ddc1464d15e3b54a61643a3c 100644 --- a/software/postgres/software.cfg +++ b/software/postgres/software.cfg @@ -7,14 +7,18 @@ extends = parts = eggs slapos-cookbook - instance-template + instance postgresql -[instance-template] + +#---------------- +#-- Instance-level buildout profiles. + +[instance] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg.in -output = ${buildout:directory}/template.cfg -md5sum = 5ccffbfc2f1d06fd3ef199bc8b643db7 +output = ${buildout:directory}/instance.cfg +md5sum = 0a500f601bd3c2d5f1cd7ca24bb9d6f3 mode = 0644 @@ -23,3 +27,48 @@ recipe = zc.recipe.egg eggs = cns.recipe.symlink + +[versions] +Jinja2 = 2.6 +Werkzeug = 0.8.3 +buildout-versions = 1.7 +cns.recipe.symlink = 0.2.3 +hexagonit.recipe.cmmi = 1.6 +inotifyx = 0.2.0 +lxml = 3.1beta1 +meld3 = 0.6.10 +netaddr = 0.7.10 +pytz = 2012j +slapos.core = 0.33.1 +slapos.recipe.template = 2.4.2 +xml-marshaller = 0.9.7 + +# Required by: +# slapos.core==0.33.1 +Flask = 0.9 + +# Required by: +# hexagonit.recipe.cmmi==1.6 +hexagonit.recipe.download = 1.6 + +# Required by: +# slapos.core==0.33.1 +netifaces = 0.8 + +# Required by: +# cns.recipe.symlink==0.2.3 +# slapos.cookbook==0.71.2-dev +# slapos.core==0.33.1 +# supervisor==3.0b1 +# zc.buildout==1.6.0-dev-SlapOS-010 +# zope.interface==4.0.3 +setuptools = 0.6c12dev-r88846 + +# Required by: +# slapos.core==0.33.1 +supervisor = 3.0b1 + +# Required by: +# slapos.core==0.33.1 +zope.interface = 4.0.3 +