Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
007784c4
Commit
007784c4
authored
Nov 06, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
further rename-simplify-cleanup
parent
da17f680
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
28 additions
and
46 deletions
+28
-46
stack/lamp/apache/instance-apache-import.cfg
stack/lamp/apache/instance-apache-import.cfg
+1
-1
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+3
-3
stack/lamp/instance.cfg.in
stack/lamp/instance.cfg.in
+4
-4
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
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+16
-24
stack/resilient/pbsready-export.cfg.in
stack/resilient/pbsready-export.cfg.in
+1
-1
stack/resilient/pbsready-import.cfg.in
stack/resilient/pbsready-import.cfg.in
+1
-1
stack/resilient/pbsready.cfg.in
stack/resilient/pbsready.cfg.in
+0
-0
stack/resilient/switchsoftware.cfg.in
stack/resilient/switchsoftware.cfg.in
+0
-10
No files found.
stack/lamp/apache/instance-apache-import.cfg
View file @
007784c4
[buildout]
extends = ${instance-apache-php:output}
${
instance-
pbsready-export:output}
${pbsready-export:output}
parts =
apache-proxy
...
...
stack/lamp/buildout.cfg
View file @
007784c4
...
...
@@ -68,7 +68,7 @@ strip-top-level-dir = true
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
#md5sum = 5b7ad4002de3e3e46fb2c3b7e44c81c0
md5sum = 9e6a4adaa6b5ac923ad16e637bf5170c
mode = 0644
[instance-apache-php]
...
...
@@ -112,14 +112,14 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
output = ${buildout:directory}/instance-mariadb-import.cfg
#md5sum = 0a3f052a38298dc4153a6eca13712b28
md5sum = 24a9286f1aed04f7393c92f251cbe0c9
mode = 0644
[template-mariadb-export]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
output = ${buildout:directory}/instance-mariadb-export.cfg
#md5sum = 3638ea4fa57144b88562cb1bcb3531dc
md5sum = 96e915bca045e3ff62a3f8fc6e692685
mode = 0644
...
...
stack/lamp/instance.cfg.in
View file @
007784c4
[buildout]
extends =
${template-switchsoftware:output}
parts =
switch_softwaretype
...
...
@@ -18,7 +15,10 @@ resilient = ${template-resilient-lamp:rendered}
mariadb = ${template-mariadb:output}
mariadb-import = ${template-mariadb-import:output}
mariadb-export = ${template-mariadb-export:output}
pull-backup = ${template-pull-backup:output}
apache-backup = ${instance-apache-backup:output}
#frozen creates a syntax error, meaning it can keep its data.
#It's dirty as hell, it needs to be replaced.
frozen = ${instance-frozen:output}
pull-backup = ${template-pull-backup:output}
stack/lamp/mariadb/instance-mariadb-export.cfg.in
View file @
007784c4
[buildout]
extends = ${template-mariadb:output}
${
instance-
pbsready-export:output}
${pbsready-export:output}
parts += mariadb
...
...
stack/lamp/mariadb/instance-mariadb-import.cfg.in
View file @
007784c4
[buildout]
extends = ${template-mariadb:output}
${
instance-
pbsready-import:output}
${pbsready-import:output}
parts += mariadb
...
...
stack/resilient/buildout.cfg
View file @
007784c4
...
...
@@ -2,9 +2,9 @@
parts =
#Templates needed to setup automatic backup
instance-
pbsready
instance-
pbsready-import
instance-
pbsready-export
pbsready
pbsready-import
pbsready-export
template-replicated
template-parts
...
...
@@ -12,35 +12,34 @@ parts =
instance-frozen
template-resilient
template-switchsoftware
[
instance-
pbsready]
[pbsready]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/
instance-
pbsready.cfg.in
output = ${buildout:directory}/
instance-
pbsready.cfg
url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/pbsready.cfg
md5sum = 45e64cfb6afbcfda1f9f85e33c73bd99
mode = 0644
[
instance-
pbsready-import]
[pbsready-import]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/
instance-
pbsready-import.cfg.in
output = ${buildout:directory}/
instance-
pbsready-import.cfg
#md5sum = 398e77061a904d0565db57b1ffbaf128
url = ${:_profile_base_location_}/pbsready-import.cfg.in
output = ${buildout:directory}/pbsready-import.cfg
md5sum = 0c63d9202426c257576c14113614942d
mode = 0644
[
instance-
pbsready-export]
[pbsready-export]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/
instance-
pbsready-export.cfg.in
output = ${buildout:directory}/
instance-
pbsready-export.cfg
#md5sum = 29d36aac2008b173cb9ce5da9e88c0fa
url = ${:_profile_base_location_}/pbsready-export.cfg.in
output = ${buildout:directory}/pbsready-export.cfg
md5sum = a82c4551efdb000dc1db18adb5b64754
mode = 0644
[template-pull-backup]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
output = ${buildout:directory}/instance-pull-backup.cfg
md5sum =
f88cc9192a63c88f83a9e5191075534e
md5sum =
dd91dd7c1845f120eb5b1987c2689b40
mode = 0644
[template-replicated]
...
...
@@ -53,7 +52,7 @@ destination = ${buildout:directory}/template-replicated.cfg.in
[template-parts]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/template-parts.cfg.in
md5sum =
f5fc27235725f05fdbde76a78ebc363e
md5sum =
c942f82552fcb42fc74a5f896e0cd5f3
mode = 0644
destination = ${buildout:directory}/template-parts.cfg.in
...
...
@@ -69,10 +68,3 @@ output = ${buildout:directory}/resilient.cfg
md5sum = 59e74d290d623de2c1e147e48f284fba
mode = 0644
[template-switchsoftware]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/switchsoftware.cfg.in
output = ${buildout:directory}/switchsoftware.cfg
#md5sum = a0e895173ff33ffea97b0bbb52d7e486
mode = 0644
stack/resilient/
instance-
pbsready-export.cfg.in
→
stack/resilient/pbsready-export.cfg.in
View file @
007784c4
[buildout]
extends = ${
instance-
pbsready:output}
extends = ${pbsready:output}
parts += cron-entry-backup
...
...
stack/resilient/
instance-
pbsready-import.cfg.in
→
stack/resilient/pbsready-import.cfg.in
View file @
007784c4
[buildout]
extends = ${
instance-
pbsready:output}
extends = ${pbsready:output}
parts += import-on-notification
...
...
stack/resilient/
instance-
pbsready.cfg.in
→
stack/resilient/pbsready.cfg.in
View file @
007784c4
File moved
stack/resilient/switchsoftware.cfg.in
deleted
100644 → 0
View file @
da17f680
[buildout]
parts =
switch_softwaretype
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
pull-backup = ${template-pull-backup:output}
#frozen creates a syntax error, meaning it can keep its data.
#It's dirty as hell, it needs to be replaced.
frozen = ${instance-frozen:output}
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