Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SlapOS Develop
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
SlapOS Develop
Commits
087da08c
Commit
087da08c
authored
Feb 21, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify and fix aprts of exporters/importer.
Fix
aac29aa6
. parts+= *is* *a* *nightmare*.
parent
625a8783
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
18 deletions
+34
-18
stack/lamp/apache/instance-apache-export.cfg.jinja2
stack/lamp/apache/instance-apache-export.cfg.jinja2
+17
-2
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+3
-3
stack/lamp/mariadb/instance-mariadb-export.cfg.in
stack/lamp/mariadb/instance-mariadb-export.cfg.in
+14
-6
stack/lamp/mariadb/instance-mariadb-import.cfg.in
stack/lamp/mariadb/instance-mariadb-import.cfg.in
+0
-7
No files found.
stack/lamp/apache/instance-apache-export.cfg.jinja2
View file @
087da08c
...
@@ -12,8 +12,23 @@ extends = {{templateapache}}
...
@@ -12,8 +12,23 @@ extends = {{templateapache}}
parts +=
parts +=
{{ parts.replicate("mariadb", "3") }}
{{ parts.replicate("mariadb", "3") }}
# have to repeat the next one, as it's not inherited from pbsready-export
cron-entry-backup
# Repeating parts from instance-apache-php.
# XXX-Cedric: how to simplify this?
certificate-authority
ca-stunnel
logrotate
logrotate-entry-apache
logrotate-entry-stunnel
cron
cron-entry-logrotate
promise
slapmonitor
slapmonitor-xml
frontend-promise
content-promise
publish-connection-informations
{{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }}
{{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }}
...
...
stack/lamp/buildout.cfg
View file @
087da08c
...
@@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output
...
@@ -95,7 +95,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 =
fb5c121e8d6ab4a23d22d2bd23b6f445
md5sum =
6647004fd5a2a3d74e3d7f8aa6b4b226
mode = 0644
mode = 0644
[instance-resilient]
[instance-resilient]
...
@@ -124,14 +124,14 @@ mode = 0644
...
@@ -124,14 +124,14 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
output = ${buildout:directory}/instance-mariadb-import.cfg
output = ${buildout:directory}/instance-mariadb-import.cfg
md5sum =
8009627bb669d1fee0df030daa8d3bdc
md5sum =
faf5826f4b27e362f34ad17db54b8c9a
mode = 0644
mode = 0644
[instance-mariadb-export]
[instance-mariadb-export]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
output = ${buildout:directory}/instance-mariadb-export.cfg
output = ${buildout:directory}/instance-mariadb-export.cfg
md5sum =
0513bf25fbb20cccd57f285c40d96498
md5sum =
13703a15d9d73f59598505dac8ed4967
mode = 0644
mode = 0644
...
...
stack/lamp/mariadb/instance-mariadb-export.cfg.in
View file @
087da08c
...
@@ -2,13 +2,21 @@
...
@@ -2,13 +2,21 @@
extends = ${instance-mariadb:output}
extends = ${instance-mariadb:output}
${pbsready-export:output}
${pbsready-export:output}
# Repeating parts from instance-mariadb.
parts +=
parts +=
mariadb
urls
mariadb
# have to repeat the next one, as it's not inherited from pbsready-export
stunnel
cron-entry-backup
certificate-authority
ca-stunnel
logrotate
logrotate-entry-mariadb
logrotate-entry-stunnel
logrotate-entry-cron
cron
cron-entry-logrotate
slapmonitor
slapmonitor-xml
[exporter]
[exporter]
recipe = slapos.cookbook:mydumper
recipe = slapos.cookbook:mydumper
...
...
stack/lamp/mariadb/instance-mariadb-import.cfg.in
View file @
087da08c
...
@@ -2,13 +2,6 @@
...
@@ -2,13 +2,6 @@
extends = ${instance-mariadb:output}
extends = ${instance-mariadb:output}
${pbsready-import:output}
${pbsready-import:output}
parts +=
mariadb
# have to repeat the next one, as it's not inherited from pbsready-import
import-on-notification
[importer]
[importer]
recipe = slapos.cookbook:mydumper
recipe = slapos.cookbook:mydumper
wrapper = $${rootdirectory:bin}/myloader
wrapper = $${rootdirectory:bin}/myloader
...
...
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