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
b0a01f54
Commit
b0a01f54
authored
Aug 29, 2012
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add promises on lxc SR
parent
a7edaab5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
5 deletions
+62
-5
software/lxc/check_exists.sh.in
software/lxc/check_exists.sh.in
+3
-0
software/lxc/check_state.sh.in
software/lxc/check_state.sh.in
+8
-0
software/lxc/instance-lxc.cfg
software/lxc/instance-lxc.cfg
+32
-1
software/lxc/software.cfg
software/lxc/software.cfg
+19
-4
No files found.
software/lxc/check_exists.sh.in
0 → 100644
View file @
b0a01f54
#!${:bash} -e
${:test-binary} -f ${:file}
software/lxc/check_state.sh.in
0 → 100644
View file @
b0a01f54
#!${:bash} -e
if [ -f ${:file} ]
then
${:test-binary} $(${:cat} ${:file}) = ${:value}
else
exit 1
fi
software/lxc/instance-lxc.cfg
View file @
b0a01f54
...
@@ -12,6 +12,10 @@ parts =
...
@@ -12,6 +12,10 @@ parts =
shellinabox
shellinabox
certificate-authority
certificate-authority
ca-shellinabox
ca-shellinabox
container-promise
shellinabox-promise
rootfs-promise
[rootdirectory]
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -23,6 +27,7 @@ bin = $${buildout:directory}/bin
...
@@ -23,6 +27,7 @@ bin = $${buildout:directory}/bin
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
services = $${rootdirectory:etc}/run
services = $${rootdirectory:etc}/run
promises = $${rootdirectory:etc}/promise
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -45,7 +50,6 @@ certs = $${directory:ca-dir}/certs/
...
@@ -45,7 +50,6 @@ certs = $${directory:ca-dir}/certs/
newcerts = $${directory:ca-dir}/newcerts/
newcerts = $${directory:ca-dir}/newcerts/
crl = $${directory:ca-dir}/crl/
crl = $${directory:ca-dir}/crl/
[rootfs]
[rootfs]
recipe = slapos.cookbook:downloader
recipe = slapos.cookbook:downloader
url = $${slap-parameter:rootfs}
url = $${slap-parameter:rootfs}
...
@@ -118,6 +122,33 @@ recipe = slapos.cookbook:publish
...
@@ -118,6 +122,33 @@ recipe = slapos.cookbook:publish
url = https://[$${shellinabox:ipv6}]:$${shellinabox:port}/
url = https://[$${shellinabox:ipv6}]:$${shellinabox:port}/
password = $${shellinabox:password}
password = $${shellinabox:password}
[template-promise-state]
recipe = slapos.recipe.template
url = ${promise-state:location}/${promise-state:filename}
bash = ${bash:location}/bin/bash
test-binary = ${coreutils:location}/bin/test
cat = ${coreutils:location}/bin/cat
value = started
mode = 700
[container-promise]
<= template-promise-state
output = $${basedirectory:promises}/slapcontainer
file = $${buildout:directory}/.slapcontainer.state
[shellinabox-promise]
<= template-promise-state
output = $${basedirectory:promises}/shellinabox
file = $${buildout:directory}/.shellinabox.state
[rootfs-promise]
recipe = slapos.recipe.template
url = ${promise-exists:location}/${promise-exists:filename}
output = $${basedirectory:promises}/rootfs
bash = ${bash:location}/bin/bash
test-binary = ${coreutils:location}/bin/test
file = $${rootfs:downloaded-file-complete}
mode = 700
[slap-parameter]
[slap-parameter]
rootfs-md5sum =
rootfs-md5sum =
software/lxc/software.cfg
View file @
b0a01f54
...
@@ -11,6 +11,8 @@ extends =
...
@@ -11,6 +11,8 @@ extends =
../../component/tar/buildout.cfg
../../component/tar/buildout.cfg
../../component/shellinabox/buildout.cfg
../../component/shellinabox/buildout.cfg
../../component/pwgen/buildout.cfg
../../component/pwgen/buildout.cfg
../../component/bash/buildout.cfg
../../component/coreutils/buildout.cfg
find-links +=
find-links +=
http://www.nexedi.org/static/packages/source/slapos-lxc/
http://www.nexedi.org/static/packages/source/slapos-lxc/
...
@@ -36,18 +38,31 @@ mode = 0644
...
@@ -36,18 +38,31 @@ mode = 0644
[template-lxc]
[template-lxc]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-lxc.cfg
url = ${:_profile_base_location_}/instance-lxc.cfg
md5sum =
056912602caa71a2af9fcae97ee6dfb9
md5sum =
af5e31fb41e2d31b25f172df45f29fc6
output = ${buildout:directory}/template-lxc.cfg
output = ${buildout:directory}/template-lxc.cfg
mode = 0644
mode = 0644
[
lxc-conf-in
]
[
download
]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
filename = lxc.conf.in
md5sum = b25334fc369e4e0f608bc64f14b0315d
download-only = true
download-only = true
mode = 0644
mode = 0644
[lxc-conf-in]
<= download
filename = lxc.conf.in
md5sum = b25334fc369e4e0f608bc64f14b0315d
[promise-state]
<= download
filename = check_state.sh.in
md5sum = 725fb0477f8b8778566ed4b22b25bf27
[promise-exists]
<= download
filename = check_exists.sh.in
md5sum = 60d4f5f73a3d10a3d7d7201aab977d19
[slapos-toolbox]
[slapos-toolbox]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
scripts = slapcontainer
scripts = slapcontainer
...
...
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