Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos
Commits
4f6ae47c
Commit
4f6ae47c
authored
Mar 11, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replaced reference to mariadb -> postgres
parent
35dd3c5b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
stack/lapp/apache/instance-apache-export.cfg.jinja2
stack/lapp/apache/instance-apache-export.cfg.jinja2
+5
-5
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+2
-2
stack/lapp/instance-resilient.cfg.jinja2
stack/lapp/instance-resilient.cfg.jinja2
+1
-1
No files found.
stack/lapp/apache/instance-apache-export.cfg.jinja2
View file @
4f6ae47c
# This file is responsible of three things:
# This file is responsible of three things:
# 1/ Act as "Apache exporter"
# 1/ Act as "Apache exporter"
# 2/ Act as "
Mariadb
backup infrastructure requester"
# 2/ Act as "
Postgres
backup infrastructure requester"
# 3/ Act as "Apache" instance
# 3/ Act as "Apache" instance
{% import 'parts' as parts %}
{% import 'parts' as parts %}
...
@@ -11,7 +11,7 @@ extends = {{templateapache}}
...
@@ -11,7 +11,7 @@ extends = {{templateapache}}
{{templatepbsreadyexport}}
{{templatepbsreadyexport}}
parts +=
parts +=
{{ parts.replicate("
mariadb
", "3") }}
{{ parts.replicate("
postgres
", "3") }}
# Repeating parts from instance-apache-php.
# Repeating parts from instance-apache-php.
# XXX-Cedric: how to simplify this?
# XXX-Cedric: how to simplify this?
...
@@ -27,7 +27,7 @@ parts +=
...
@@ -27,7 +27,7 @@ parts +=
content-promise
content-promise
publish-connection-informations
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.
# Nothing to do for the exporter. Just dummy part that does nothing.
# For httpd instance, PBS will directly pull data from srv/www.
# For httpd instance, PBS will directly pull data from srv/www.
...
@@ -47,8 +47,8 @@ path = ${directory:www}
...
@@ -47,8 +47,8 @@ path = ${directory:www}
# parameters of the requested instance. Requirement: aggregated publish.
# parameters of the requested instance. Requirement: aggregated publish.
<= resilient-publish-connection-parameter
<= 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
# XXX-Cedric: change the request method to return everything from
# getConnectionParameterDict()
# getConnectionParameterDict()
[request-
mariadb
]
[request-
postgres
]
return = ssh-public-key ssh-url notification-id ip url
return = ssh-public-key ssh-url notification-id ip url
stack/lapp/buildout.cfg
View file @
4f6ae47c
...
@@ -83,7 +83,7 @@ context = key templateapache instance-apache-php:output
...
@@ -83,7 +83,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
import-list = file parts template-parts:destination
file replicated template-replicated:destination
file replicated template-replicated:destination
md5sum =
4704f2788f096c7494694db72a9f6193
md5sum =
6acbd3cb4dd72ddeb89bc0b6e8317a3a
mode = 0644
mode = 0644
[instance-resilient]
[instance-resilient]
...
@@ -98,7 +98,7 @@ context = key buildout buildout:bin-directory
...
@@ -98,7 +98,7 @@ context = key buildout buildout:bin-directory
import-list = file parts template-parts:destination
import-list = file parts template-parts:destination
file replicated template-replicated:destination
file replicated template-replicated:destination
md5sum = 2
24a7e73db84168cd5aedec10ddd50f2
md5sum = 2
eaa5130bf822c4a992462861626cf01
mode = 0644
mode = 0644
[instance-postgres]
[instance-postgres]
...
...
stack/lapp/instance-resilient.cfg.jinja2
View file @
4f6ae47c
...
@@ -35,7 +35,7 @@ url = ${request-apache:connection-url}
...
@@ -35,7 +35,7 @@ url = ${request-apache:connection-url}
[slap-parameter]
[slap-parameter]
# Default parameters for distributed deployment
# 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.
# XXX-Cedric: Hardcoded number of backups. Should be dynamically generated.
postgres1-computer-guid =
postgres1-computer-guid =
pbs-postgres1-computer-guid =
pbs-postgres1-computer-guid =
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment