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
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
Nirina Malard
slapos
Commits
9326f333
Commit
9326f333
authored
Nov 21, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'resiliency_annotated' into lapp-resilient2
parents
a3dc530a
719fb736
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+10
-10
stack/lamp/instance.cfg.in
stack/lamp/instance.cfg.in
+3
-3
stack/lamp/mariadb/instance-mariadb-export.cfg.in
stack/lamp/mariadb/instance-mariadb-export.cfg.in
+1
-1
stack/lamp/mariadb/instance-mariadb-import.cfg.in
stack/lamp/mariadb/instance-mariadb-import.cfg.in
+1
-1
No files found.
stack/lamp/buildout.cfg
View file @
9326f333
...
@@ -11,14 +11,14 @@ parts =
...
@@ -11,14 +11,14 @@ parts =
dropbear
dropbear
eggs
eggs
instance-recipe-egg
instance-recipe-egg
templat
e
instanc
e
instance-apache-php
instance-apache-php
templat
e-mariadb
instanc
e-mariadb
#Contains the importer and exporter recipes for mariadb
#Contains the importer and exporter recipes for mariadb
templat
e-mariadb-import
instanc
e-mariadb-import
templat
e-mariadb-export
instanc
e-mariadb-export
instance-default-root
instance-default-root
...
@@ -72,7 +72,7 @@ strip-top-level-dir = true
...
@@ -72,7 +72,7 @@ strip-top-level-dir = true
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
output = ${buildout:directory}/instance.cfg
md5sum =
9e6a4adaa6b5ac923ad16e637bf5170c
md5sum =
bf4932305b1075b632b2adf2017c0c0e
mode = 0644
mode = 0644
[instance-apache-php]
[instance-apache-php]
...
@@ -105,25 +105,25 @@ md5sum = 5151295af3994499e2be6d68938787d3
...
@@ -105,25 +105,25 @@ md5sum = 5151295af3994499e2be6d68938787d3
mode = 0644
mode = 0644
[
templat
e-mariadb]
[
instanc
e-mariadb]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
output = ${buildout:directory}/instance-mariadb.cfg
output = ${buildout:directory}/instance-mariadb.cfg
md5sum = aa33c843f04753a34154467522f0c65e
md5sum = aa33c843f04753a34154467522f0c65e
mode = 0644
mode = 0644
[
templat
e-mariadb-import]
[
instanc
e-mariadb-import]
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 =
24a9286f1aed04f7393c92f251cbe0c9
md5sum =
ea43b8ed38a55a11b027fc283c0e718a
mode = 0644
mode = 0644
[
templat
e-mariadb-export]
[
instanc
e-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 =
96e915bca045e3ff62a3f8fc6e692685
md5sum =
685c8abf0f487c72273846002ec631a0
mode = 0644
mode = 0644
...
...
stack/lamp/instance.cfg.in
View file @
9326f333
...
@@ -12,9 +12,9 @@ recipe = slapos.cookbook:softwaretype
...
@@ -12,9 +12,9 @@ recipe = slapos.cookbook:softwaretype
default = ${instance-default-root:output}
default = ${instance-default-root:output}
apache = ${instance-apache-php:output}
apache = ${instance-apache-php:output}
resilient = ${template-resilient-lamp:rendered}
resilient = ${template-resilient-lamp:rendered}
mariadb = ${
templat
e-mariadb:output}
mariadb = ${
instanc
e-mariadb:output}
mariadb-import = ${
templat
e-mariadb-import:output}
mariadb-import = ${
instanc
e-mariadb-import:output}
mariadb-export = ${
templat
e-mariadb-export:output}
mariadb-export = ${
instanc
e-mariadb-export:output}
apache-backup = ${instance-apache-backup:output}
apache-backup = ${instance-apache-backup:output}
#frozen creates a syntax error, meaning it can keep its data.
#frozen creates a syntax error, meaning it can keep its data.
...
...
stack/lamp/mariadb/instance-mariadb-export.cfg.in
View file @
9326f333
[buildout]
[buildout]
extends = ${
templat
e-mariadb:output}
extends = ${
instanc
e-mariadb:output}
${pbsready-export:output}
${pbsready-export:output}
parts += mariadb
parts += mariadb
...
...
stack/lamp/mariadb/instance-mariadb-import.cfg.in
View file @
9326f333
[buildout]
[buildout]
extends = ${
templat
e-mariadb:output}
extends = ${
instanc
e-mariadb:output}
${pbsready-import:output}
${pbsready-import:output}
parts += mariadb
parts += mariadb
...
...
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