diff --git a/stack/lapp/apache/instance-apache-export.cfg.jinja2 b/stack/lapp/apache/instance-apache-export.cfg.jinja2 index ac2c24505c5d86beb50fbe4e49e25dab7fcfe998..7e6c20b1305c603977710f9050da13cd3744f33f 100644 --- a/stack/lapp/apache/instance-apache-export.cfg.jinja2 +++ b/stack/lapp/apache/instance-apache-export.cfg.jinja2 @@ -1,6 +1,6 @@ # This file is responsible of three things: # 1/ Act as "Apache exporter" -# 2/ Act as "Mariadb backup infrastructure requester" +# 2/ Act as "Postgres backup infrastructure requester" # 3/ Act as "Apache" instance {% import 'parts' as parts %} @@ -11,7 +11,7 @@ extends = {{templateapache}} {{templatepbsreadyexport}} parts += - {{ parts.replicate("mariadb", "3") }} + {{ parts.replicate("postgres", "3") }} # Repeating parts from instance-apache-php. # XXX-Cedric: how to simplify this? @@ -27,7 +27,7 @@ parts += content-promise publish-connection-informations -{{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }} +{{ replicated.replicate("postgres", "3", "postgres-export", "postgres-import") }} # Nothing to do for the exporter. Just dummy part that does nothing. # For httpd instance, PBS will directly pull data from srv/www. @@ -47,8 +47,8 @@ path = ${directory:www} # parameters of the requested instance. Requirement: aggregated publish. <= resilient-publish-connection-parameter -# XXX-Cedric: resilient overwrites what's returned from request-mariadb +# XXX-Cedric: resilient overwrites what's returned from request-postgres # XXX-Cedric: change the request method to return everything from # getConnectionParameterDict() -[request-mariadb] +[request-postgres] return = ssh-public-key ssh-url notification-id ip url diff --git a/stack/lapp/buildout.cfg b/stack/lapp/buildout.cfg index c410d62daf0b53c987b0d0deea6652af8eb119d3..11d8a5ba8132dedf667d21b0e65655fc7ee24f4b 100644 --- a/stack/lapp/buildout.cfg +++ b/stack/lapp/buildout.cfg @@ -83,7 +83,7 @@ context = key templateapache instance-apache-php:output import-list = file parts template-parts:destination file replicated template-replicated:destination -md5sum = 4704f2788f096c7494694db72a9f6193 +md5sum = 6acbd3cb4dd72ddeb89bc0b6e8317a3a mode = 0644 [instance-resilient] @@ -98,7 +98,7 @@ context = key buildout buildout:bin-directory import-list = file parts template-parts:destination file replicated template-replicated:destination -md5sum = 224a7e73db84168cd5aedec10ddd50f2 +md5sum = 2eaa5130bf822c4a992462861626cf01 mode = 0644 [instance-postgres] diff --git a/stack/lapp/instance-resilient.cfg.jinja2 b/stack/lapp/instance-resilient.cfg.jinja2 index fb80a0fce621b9a8c09b8e80f955cd3511cf171e..5f016a2a9c9675ce0cbe815b94396768f1142b90 100644 --- a/stack/lapp/instance-resilient.cfg.jinja2 +++ b/stack/lapp/instance-resilient.cfg.jinja2 @@ -35,7 +35,7 @@ url = ${request-apache:connection-url} [slap-parameter] # Default parameters for distributed deployment -# I.e state "backup1 of maria should go there, ..." +# I.e state "backup1 of postgres should go there, ..." # XXX-Cedric: Hardcoded number of backups. Should be dynamically generated. postgres1-computer-guid = pbs-postgres1-computer-guid =