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
Labels
Merge Requests
107
Merge Requests
107
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
da17f680
Commit
da17f680
authored
Nov 06, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
further directory renaming, small cleanup
parent
5b901ee5
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
42 additions
and
45 deletions
+42
-45
stack/lamp/apache/instance-apache-import.cfg
stack/lamp/apache/instance-apache-import.cfg
+2
-2
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+12
-12
stack/lamp/instance-default-root.cfg.in
stack/lamp/instance-default-root.cfg.in
+0
-0
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
+2
-2
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
+11
-11
stack/resilient/instance-pbsready-export.cfg.in
stack/resilient/instance-pbsready-export.cfg.in
+2
-1
stack/resilient/instance-pbsready-import.cfg.in
stack/resilient/instance-pbsready-import.cfg.in
+1
-1
stack/resilient/instance-pull-backup.cfg.in
stack/resilient/instance-pull-backup.cfg.in
+5
-9
stack/resilient/switchsoftware.cfg.in
stack/resilient/switchsoftware.cfg.in
+1
-1
stack/resilient/template-parts.cfg.in
stack/resilient/template-parts.cfg.in
+1
-1
No files found.
stack/lamp/apache/instance-apache-import.cfg
View file @
da17f680
[buildout]
[buildout]
extends = ${
templat
e-apache-php:output}
extends = ${
instanc
e-apache-php:output}
${
templat
e-pbsready-export:output}
${
instanc
e-pbsready-export:output}
parts =
parts =
apache-proxy
apache-proxy
...
...
stack/lamp/buildout.cfg
View file @
da17f680
...
@@ -13,14 +13,14 @@ parts =
...
@@ -13,14 +13,14 @@ parts =
instance-recipe-egg
instance-recipe-egg
template
template
templat
e-apache-php
instanc
e-apache-php
template-mariadb
template-mariadb
#Contains the importer and exporter recipes for mariadb
#Contains the importer and exporter recipes for mariadb
template-mariadb-import
template-mariadb-import
template-mariadb-export
template-mariadb-export
templat
e-default-root
instanc
e-default-root
extends =
extends =
...
@@ -68,17 +68,17 @@ strip-top-level-dir = true
...
@@ -68,17 +68,17 @@ 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 = e080e7d978a1a2ec78a775ee48dda1d
0
#md5sum = 5b7ad4002de3e3e46fb2c3b7e44c81c
0
mode = 0644
mode = 0644
[
templat
e-apache-php]
[
instanc
e-apache-php]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
output = ${buildout:directory}/instance-apache-php.cfg
md5sum = a5dd222b3faa4e1ef2df9b3b9bb47966
md5sum = a5dd222b3faa4e1ef2df9b3b9bb47966
mode = 0644
mode = 0644
[
templat
e-apache-backup]
[
instanc
e-apache-backup]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-backup.cfg.in
url = ${:_profile_base_location_}/apache/instance-apache-backup.cfg.in
output = ${buildout:directory}/instance-apache-backup.cfg
output = ${buildout:directory}/instance-apache-backup.cfg
...
@@ -90,7 +90,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -90,7 +90,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/template-resilient.cfg.in
template = ${:_profile_base_location_}/template-resilient.cfg.in
rendered = ${buildout:directory}/instance-resilient.cfg
rendered = ${buildout:directory}/instance-resilient.cfg
context = key templateapache
templat
e-apache-php:output
context = key templateapache
instanc
e-apache-php:output
key dropbear dropbear:location
key dropbear dropbear:location
key buildout buildout:bin-directory
key buildout buildout:bin-directory
...
@@ -112,22 +112,22 @@ mode = 0644
...
@@ -112,22 +112,22 @@ 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 = fa696733db4bd5b2e3e9fb6e0b09c59b
#md5sum = 0a3f052a38298dc4153a6eca13712b28
mode = 0644
mode = 0644
[template-mariadb-export]
[template-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 = 4b7dec765265b27c8235419b82ca7b02
#md5sum = 3638ea4fa57144b88562cb1bcb3531dc
mode = 0644
mode = 0644
[
templat
e-default-root]
[
instanc
e-default-root]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/default-root.cfg.in
url = ${:_profile_base_location_}/
instance-
default-root.cfg.in
output = ${buildout:directory}/default-root.cfg
output = ${buildout:directory}/
instance-
default-root.cfg
#md5sum = 48e0c1511db6786d63b1e194446b506
b
md5sum = 53c9020f7a0b5203f976e069e455787
b
mode = 0644
mode = 0644
...
...
stack/lamp/default-root.cfg.in
→
stack/lamp/
instance-
default-root.cfg.in
View file @
da17f680
File moved
stack/lamp/instance.cfg.in
View file @
da17f680
...
@@ -12,13 +12,13 @@ offline = true
...
@@ -12,13 +12,13 @@ offline = true
[switch_softwaretype]
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
default = ${
templat
e-default-root:output}
default = ${
instanc
e-default-root:output}
apache = ${
templat
e-apache-php:output}
apache = ${
instanc
e-apache-php:output}
resilient = ${template-resilient-lamp:rendered}
resilient = ${template-resilient-lamp:rendered}
mariadb = ${template-mariadb:output}
mariadb = ${template-mariadb:output}
mariadb-import = ${template-mariadb-import:output}
mariadb-import = ${template-mariadb-import:output}
mariadb-export = ${template-mariadb-export:output}
mariadb-export = ${template-mariadb-export:output}
pull-backup = ${template-pull-backup:output}
pull-backup = ${template-pull-backup:output}
apache-backup = ${
templat
e-apache-backup:output}
apache-backup = ${
instanc
e-apache-backup:output}
frozen = ${
templat
e-frozen:output}
frozen = ${
instanc
e-frozen:output}
stack/lamp/mariadb/instance-mariadb-export.cfg.in
View file @
da17f680
[buildout]
[buildout]
extends = ${template-mariadb:output}
extends = ${template-mariadb:output}
${
templat
e-pbsready-export:output}
${
instanc
e-pbsready-export:output}
parts += mariadb
parts += mariadb
...
@@ -12,4 +12,4 @@ socket = $${mariadb:socket}
...
@@ -12,4 +12,4 @@ socket = $${mariadb:socket}
user = root
user = root
mydumper-binary = ${mydumper:location}/bin/mydumper
mydumper-binary = ${mydumper:location}/bin/mydumper
database = $${mariadb:database}
database = $${mariadb:database}
import = false
import = false
\ No newline at end of file
stack/lamp/mariadb/instance-mariadb-import.cfg.in
View file @
da17f680
[buildout]
[buildout]
extends = ${template-mariadb:output}
extends = ${template-mariadb:output}
${
templat
e-pbsready-import:output}
${
instanc
e-pbsready-import:output}
parts += mariadb
parts += mariadb
...
...
stack/resilient/buildout.cfg
View file @
da17f680
...
@@ -2,38 +2,38 @@
...
@@ -2,38 +2,38 @@
parts =
parts =
#Templates needed to setup automatic backup
#Templates needed to setup automatic backup
templat
e-pbsready
instanc
e-pbsready
templat
e-pbsready-import
instanc
e-pbsready-import
templat
e-pbsready-export
instanc
e-pbsready-export
template-replicated
template-replicated
template-parts
template-parts
#Frozen is the state used to not destroy a broken instance's content
#Frozen is the state used to not destroy a broken instance's content
templat
e-frozen
instanc
e-frozen
template-resilient
template-resilient
template-switchsoftware
template-switchsoftware
[
templat
e-pbsready]
[
instanc
e-pbsready]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pbsready.cfg.in
url = ${:_profile_base_location_}/instance-pbsready.cfg.in
output = ${buildout:directory}/instance-pbsready.cfg
output = ${buildout:directory}/instance-pbsready.cfg
md5sum = 45e64cfb6afbcfda1f9f85e33c73bd99
md5sum = 45e64cfb6afbcfda1f9f85e33c73bd99
mode = 0644
mode = 0644
[
templat
e-pbsready-import]
[
instanc
e-pbsready-import]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pbsready-import.cfg.in
url = ${:_profile_base_location_}/instance-pbsready-import.cfg.in
output = ${buildout:directory}/instance-pbsready-import.cfg
output = ${buildout:directory}/instance-pbsready-import.cfg
md5sum = 5ba7477f9499a7dbde5f33ca96bd6ba4
#md5sum = 398e77061a904d0565db57b1ffbaf128
mode = 0644
mode = 0644
[
templat
e-pbsready-export]
[
instanc
e-pbsready-export]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pbsready-export.cfg.in
url = ${:_profile_base_location_}/instance-pbsready-export.cfg.in
output = ${buildout:directory}/instance-pbsready-export.cfg
output = ${buildout:directory}/instance-pbsready-export.cfg
md5sum = 29d36aac2008b173cb9ce5da9e88c0fa
#
md5sum = 29d36aac2008b173cb9ce5da9e88c0fa
mode = 0644
mode = 0644
[template-pull-backup]
[template-pull-backup]
...
@@ -57,7 +57,7 @@ md5sum = f5fc27235725f05fdbde76a78ebc363e
...
@@ -57,7 +57,7 @@ md5sum = f5fc27235725f05fdbde76a78ebc363e
mode = 0644
mode = 0644
destination = ${buildout:directory}/template-parts.cfg.in
destination = ${buildout:directory}/template-parts.cfg.in
[
templat
e-frozen]
[
instanc
e-frozen]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-frozen.cfg.in
url = ${:_profile_base_location_}/instance-frozen.cfg.in
output = ${buildout:directory}/instance-frozen.cfg
output = ${buildout:directory}/instance-frozen.cfg
...
@@ -73,6 +73,6 @@ mode = 0644
...
@@ -73,6 +73,6 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/switchsoftware.cfg.in
url = ${:_profile_base_location_}/switchsoftware.cfg.in
output = ${buildout:directory}/switchsoftware.cfg
output = ${buildout:directory}/switchsoftware.cfg
md5sum = c94a0ed85fce2e72254ae956dce7e40d
#md5sum = a0e895173ff33ffea97b0bbb52d7e486
mode = 0644
mode = 0644
stack/resilient/instance-pbsready-export.cfg.in
View file @
da17f680
[buildout]
[buildout]
extends = ${template-pbsready:output}
extends = ${instance-pbsready:output}
parts += cron-entry-backup
parts += cron-entry-backup
...
...
stack/resilient/instance-pbsready-import.cfg.in
View file @
da17f680
[buildout]
[buildout]
extends = ${
templat
e-pbsready:output}
extends = ${
instanc
e-pbsready:output}
parts += import-on-notification
parts += import-on-notification
...
...
stack/resilient/instance-pull-backup.cfg.in
View file @
da17f680
...
@@ -144,11 +144,12 @@ rotate-num = 30
...
@@ -144,11 +144,12 @@ rotate-num = 30
[rootdirectory]
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
bin = $${buildout:directory}/bin/
etc = $${buildout:directory}/etc/
etc = $${buildout:directory}/etc/
var = $${buildout:directory}/var
/
home = $${buildout:directory}/home
/
srv = $${buildout:directory}/srv/
srv = $${buildout:directory}/srv/
bin = $${buildout:directory}/bin/
tmp = $${buildout:directory}/tmp/
tmp = $${buildout:directory}/tmp/
var = $${buildout:directory}/var/
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -157,6 +158,8 @@ services = $${rootdirectory:etc}/run/
...
@@ -157,6 +158,8 @@ services = $${rootdirectory:etc}/run/
run = $${rootdirectory:var}/run/
run = $${rootdirectory:var}/run/
backup = $${rootdirectory:srv}/backup/
backup = $${rootdirectory:srv}/backup/
promises = $${rootdirectory:etc}/promise/
promises = $${rootdirectory:etc}/promise/
ssh-home = $${rootdirectory:home}/ssh
notifier = $${rootdirectory:etc}/notifier/
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -173,13 +176,6 @@ dot-ssh = $${basedirectory:ssh-home}/.ssh/
...
@@ -173,13 +176,6 @@ dot-ssh = $${basedirectory:ssh-home}/.ssh/
notifier-feeds = $${basedirectory:notifier}/feeds/
notifier-feeds = $${basedirectory:notifier}/feeds/
notifier-callbacks = $${basedirectory:notifier}/callbacks/
notifier-callbacks = $${basedirectory:notifier}/callbacks/
[basedirectory]
ssh-home = $${rootdirectory:home}/ssh
notifier = $${rootdirectory:etc}/notifier/
[rootdirectory]
home = $${buildout:directory}/home/
# Default values
# Default values
[slap-parameter]
[slap-parameter]
...
...
stack/resilient/switchsoftware.cfg.in
View file @
da17f680
...
@@ -7,4 +7,4 @@ recipe = slapos.cookbook:softwaretype
...
@@ -7,4 +7,4 @@ recipe = slapos.cookbook:softwaretype
pull-backup = ${template-pull-backup:output}
pull-backup = ${template-pull-backup:output}
#frozen creates a syntax error, meaning it can keep its data.
#frozen creates a syntax error, meaning it can keep its data.
#It's dirty as hell, it needs to be replaced.
#It's dirty as hell, it needs to be replaced.
frozen = ${
templat
e-frozen:output}
frozen = ${
instanc
e-frozen:output}
stack/resilient/template-parts.cfg.in
View file @
da17f680
...
@@ -18,4 +18,4 @@
...
@@ -18,4 +18,4 @@
{% endmacro %}
{% endmacro %}
\ No newline at end of file
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