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
Titouan Soulard
slapos
Commits
085ddd3e
Commit
085ddd3e
authored
12 years ago
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
further directory renaming, small cleanup
parent
e90ce1e9
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 @
085ddd3e
[buildout]
extends = ${
templat
e-apache-php:output}
${
templat
e-pbsready-export:output}
extends = ${
instanc
e-apache-php:output}
${
instanc
e-pbsready-export:output}
parts =
apache-proxy
...
...
This diff is collapsed.
Click to expand it.
stack/lamp/buildout.cfg
View file @
085ddd3e
...
...
@@ -13,14 +13,14 @@ parts =
instance-recipe-egg
template
templat
e-apache-php
instanc
e-apache-php
template-mariadb
#Contains the importer and exporter recipes for mariadb
template-mariadb-import
template-mariadb-export
templat
e-default-root
instanc
e-default-root
extends =
...
...
@@ -68,17 +68,17 @@ strip-top-level-dir = true
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
md5sum = e080e7d978a1a2ec78a775ee48dda1d
0
#md5sum = 5b7ad4002de3e3e46fb2c3b7e44c81c
0
mode = 0644
[
templat
e-apache-php]
[
instanc
e-apache-php]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
md5sum = a5dd222b3faa4e1ef2df9b3b9bb47966
mode = 0644
[
templat
e-apache-backup]
[
instanc
e-apache-backup]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-backup.cfg.in
output = ${buildout:directory}/instance-apache-backup.cfg
...
...
@@ -90,7 +90,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/template-resilient.cfg.in
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 buildout buildout:bin-directory
...
...
@@ -112,22 +112,22 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
output = ${buildout:directory}/instance-mariadb-import.cfg
md5sum = fa696733db4bd5b2e3e9fb6e0b09c59b
#md5sum = 0a3f052a38298dc4153a6eca13712b28
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 = 4b7dec765265b27c8235419b82ca7b02
#md5sum = 3638ea4fa57144b88562cb1bcb3531dc
mode = 0644
[
templat
e-default-root]
[
instanc
e-default-root]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/default-root.cfg.in
output = ${buildout:directory}/default-root.cfg
#md5sum = 48e0c1511db6786d63b1e194446b506
b
url = ${:_profile_base_location_}/
instance-
default-root.cfg.in
output = ${buildout:directory}/
instance-
default-root.cfg
md5sum = 53c9020f7a0b5203f976e069e455787
b
mode = 0644
...
...
This diff is collapsed.
Click to expand it.
stack/lamp/default-root.cfg.in
→
stack/lamp/
instance-
default-root.cfg.in
View file @
085ddd3e
File moved
This diff is collapsed.
Click to expand it.
stack/lamp/instance.cfg.in
View file @
085ddd3e
...
...
@@ -12,13 +12,13 @@ offline = true
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${
templat
e-default-root:output}
apache = ${
templat
e-apache-php:output}
default = ${
instanc
e-default-root:output}
apache = ${
instanc
e-apache-php:output}
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 = ${
templat
e-apache-backup:output}
frozen = ${
templat
e-frozen:output}
apache-backup = ${
instanc
e-apache-backup:output}
frozen = ${
instanc
e-frozen:output}
This diff is collapsed.
Click to expand it.
stack/lamp/mariadb/instance-mariadb-export.cfg.in
View file @
085ddd3e
[buildout]
extends = ${template-mariadb:output}
${
templat
e-pbsready-export:output}
${
instanc
e-pbsready-export:output}
parts += mariadb
...
...
@@ -12,4 +12,4 @@ socket = $${mariadb:socket}
user = root
mydumper-binary = ${mydumper:location}/bin/mydumper
database = $${mariadb:database}
import = false
\ No newline at end of file
import = false
This diff is collapsed.
Click to expand it.
stack/lamp/mariadb/instance-mariadb-import.cfg.in
View file @
085ddd3e
[buildout]
extends = ${template-mariadb:output}
${
templat
e-pbsready-import:output}
${
instanc
e-pbsready-import:output}
parts += mariadb
...
...
This diff is collapsed.
Click to expand it.
stack/resilient/buildout.cfg
View file @
085ddd3e
...
...
@@ -2,38 +2,38 @@
parts =
#Templates needed to setup automatic backup
templat
e-pbsready
templat
e-pbsready-import
templat
e-pbsready-export
instanc
e-pbsready
instanc
e-pbsready-import
instanc
e-pbsready-export
template-replicated
template-parts
#Frozen is the state used to not destroy a broken instance's content
templat
e-frozen
instanc
e-frozen
template-resilient
template-switchsoftware
[
templat
e-pbsready]
[
instanc
e-pbsready]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pbsready.cfg.in
output = ${buildout:directory}/instance-pbsready.cfg
md5sum = 45e64cfb6afbcfda1f9f85e33c73bd99
mode = 0644
[
templat
e-pbsready-import]
[
instanc
e-pbsready-import]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pbsready-import.cfg.in
output = ${buildout:directory}/instance-pbsready-import.cfg
md5sum = 5ba7477f9499a7dbde5f33ca96bd6ba4
#md5sum = 398e77061a904d0565db57b1ffbaf128
mode = 0644
[
templat
e-pbsready-export]
[
instanc
e-pbsready-export]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pbsready-export.cfg.in
output = ${buildout:directory}/instance-pbsready-export.cfg
md5sum = 29d36aac2008b173cb9ce5da9e88c0fa
#
md5sum = 29d36aac2008b173cb9ce5da9e88c0fa
mode = 0644
[template-pull-backup]
...
...
@@ -57,7 +57,7 @@ md5sum = f5fc27235725f05fdbde76a78ebc363e
mode = 0644
destination = ${buildout:directory}/template-parts.cfg.in
[
templat
e-frozen]
[
instanc
e-frozen]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-frozen.cfg.in
output = ${buildout:directory}/instance-frozen.cfg
...
...
@@ -73,6 +73,6 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/switchsoftware.cfg.in
output = ${buildout:directory}/switchsoftware.cfg
md5sum = c94a0ed85fce2e72254ae956dce7e40d
#md5sum = a0e895173ff33ffea97b0bbb52d7e486
mode = 0644
This diff is collapsed.
Click to expand it.
stack/resilient/instance-pbsready-export.cfg.in
View file @
085ddd3e
[buildout]
extends = ${template-pbsready:output}
extends = ${instance-pbsready:output}
parts += cron-entry-backup
...
...
This diff is collapsed.
Click to expand it.
stack/resilient/instance-pbsready-import.cfg.in
View file @
085ddd3e
[buildout]
extends = ${
templat
e-pbsready:output}
extends = ${
instanc
e-pbsready:output}
parts += import-on-notification
...
...
This diff is collapsed.
Click to expand it.
stack/resilient/instance-pull-backup.cfg.in
View file @
085ddd3e
...
...
@@ -144,11 +144,12 @@ rotate-num = 30
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
bin = $${buildout:directory}/bin/
etc = $${buildout:directory}/etc/
var = $${buildout:directory}/var
/
home = $${buildout:directory}/home
/
srv = $${buildout:directory}/srv/
bin = $${buildout:directory}/bin/
tmp = $${buildout:directory}/tmp/
var = $${buildout:directory}/var/
[basedirectory]
recipe = slapos.cookbook:mkdirectory
...
...
@@ -157,6 +158,8 @@ services = $${rootdirectory:etc}/run/
run = $${rootdirectory:var}/run/
backup = $${rootdirectory:srv}/backup/
promises = $${rootdirectory:etc}/promise/
ssh-home = $${rootdirectory:home}/ssh
notifier = $${rootdirectory:etc}/notifier/
[directory]
recipe = slapos.cookbook:mkdirectory
...
...
@@ -173,13 +176,6 @@ dot-ssh = $${basedirectory:ssh-home}/.ssh/
notifier-feeds = $${basedirectory:notifier}/feeds/
notifier-callbacks = $${basedirectory:notifier}/callbacks/
[basedirectory]
ssh-home = $${rootdirectory:home}/ssh
notifier = $${rootdirectory:etc}/notifier/
[rootdirectory]
home = $${buildout:directory}/home/
# Default values
[slap-parameter]
...
...
This diff is collapsed.
Click to expand it.
stack/resilient/switchsoftware.cfg.in
View file @
085ddd3e
...
...
@@ -7,4 +7,4 @@ 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 = ${
templat
e-frozen:output}
frozen = ${
instanc
e-frozen:output}
This diff is collapsed.
Click to expand it.
stack/resilient/template-parts.cfg.in
View file @
085ddd3e
...
...
@@ -18,4 +18,4 @@
{% endmacro %}
\ No newline at end of file
{% endmacro %}
This diff is collapsed.
Click to expand it.
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