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
Stephane VAROQUI
slapos
Commits
fbfd51a2
Commit
fbfd51a2
authored
12 years ago
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'slaprunner'
parents
471c780c
9605f4f1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
13 deletions
+18
-13
slapos/recipe/slaprunner/__init__.py
slapos/recipe/slaprunner/__init__.py
+1
-0
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+8
-1
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+9
-9
stack/slapos.cfg
stack/slapos.cfg
+0
-3
No files found.
slapos/recipe/slaprunner/__init__.py
View file @
fbfd51a2
...
@@ -58,6 +58,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -58,6 +58,7 @@ class Recipe(GenericBaseRecipe):
supervisord_config
=
os
.
path
.
join
(
self
.
instance_directory
,
'etc'
,
supervisord_config
=
os
.
path
.
join
(
self
.
instance_directory
,
'etc'
,
'supervisord.conf'
),
'supervisord.conf'
),
runner_workdir
=
self
.
workdir
,
runner_workdir
=
self
.
workdir
,
etc
=
self
.
etc
,
runner_host
=
self
.
ipv6
,
runner_host
=
self
.
ipv6
,
runner_port
=
self
.
runner_port
,
runner_port
=
self
.
runner_port
,
ipv4_address
=
self
.
ipv4
,
ipv4_address
=
self
.
ipv4
,
...
...
This diff is collapsed.
Click to expand it.
software/slaprunner/instance-runner.cfg
View file @
fbfd51a2
...
@@ -41,6 +41,12 @@ project = $${:home}/project
...
@@ -41,6 +41,12 @@ project = $${:home}/project
software-root = $${:home}/software
software-root = $${:home}/software
instance-root = $${:home}/instance
instance-root = $${:home}/instance
#Create password for slaprunner
[slapunner-passwd]
recipe = slapos.cookbook:generate.password
storage-path = $${rootdirectory:etc}/.passwd
bytes = 4
# Deploy cloud9 and slaprunner
# Deploy cloud9 and slaprunner
[cloud9]
[cloud9]
recipe = slapos.cookbook:cloud9
recipe = slapos.cookbook:cloud9
...
@@ -65,6 +71,7 @@ working-directory = $${runnerdirectory:home}
...
@@ -65,6 +71,7 @@ working-directory = $${runnerdirectory:home}
project-directory = $${runnerdirectory:project}
project-directory = $${runnerdirectory:project}
software-directory = $${runnerdirectory:software-root}
software-directory = $${runnerdirectory:software-root}
instance-directory = $${runnerdirectory:instance-root}
instance-directory = $${runnerdirectory:instance-root}
etc = $${rootdirectory:etc}
ssh_client = $${sshkeys-dropbear:wrapper}
ssh_client = $${sshkeys-dropbear:wrapper}
public_key = $${sshkeys-dropbear:public-key}
public_key = $${sshkeys-dropbear:public-key}
private_key = $${sshkeys-dropbear:private-key}
private_key = $${sshkeys-dropbear:private-key}
...
@@ -135,7 +142,7 @@ backend_url = $${slaprunner:access-url}
...
@@ -135,7 +142,7 @@ backend_url = $${slaprunner:access-url}
url = $${request-frontend:connection-site_url}
url = $${request-frontend:connection-site_url}
cloud9_url = $${cloud9:access-url}
cloud9_url = $${cloud9:access-url}
ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
passwd = $${slapunner-passwd:passwd}
[slap-parameter]
[slap-parameter]
# Default value if no ssh key is specified
# Default value if no ssh key is specified
...
...
This diff is collapsed.
Click to expand it.
software/slaprunner/software.cfg
View file @
fbfd51a2
...
@@ -23,7 +23,7 @@ md5sum = 5307e4200f044ae57b504ad68444491c
...
@@ -23,7 +23,7 @@ md5sum = 5307e4200f044ae57b504ad68444491c
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg
output = ${buildout:directory}/template-runner.cfg
md5sum =
0ddddd0be595df4fb15d55e566cc3bc3
md5sum =
9c7daf59883c4c330064632fdaf329fa
mode = 0644
mode = 0644
[eggs]
[eggs]
...
@@ -72,18 +72,18 @@ slapos.core = 0.26.2
...
@@ -72,18 +72,18 @@ slapos.core = 0.26.2
slapos.libnetworkcache = 0.12
slapos.libnetworkcache = 0.12
slapos.recipe.build = 0.9
slapos.recipe.build = 0.9
slapos.recipe.template = 2.4
slapos.recipe.template = 2.4
slapos.toolbox = 0.26
slapos.toolbox = 0.26
.1
smmap = 0.8.2
smmap = 0.8.2
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
# Required by:
# Required by:
# slapos.core==0.26.2
# slapos.core==0.26.2
# slapos.toolbox==0.26
# slapos.toolbox==0.26
.1
Flask = 0.9
Flask = 0.9
# Required by:
# Required by:
# slapos.toolbox==0.26
# slapos.toolbox==0.26
.1
GitPython = 0.3.2.RC1
GitPython = 0.3.2.RC1
# Required by:
# Required by:
...
@@ -95,11 +95,11 @@ PyXML = 0.8.4
...
@@ -95,11 +95,11 @@ PyXML = 0.8.4
Sphinx = 1.1.3
Sphinx = 1.1.3
# Required by:
# Required by:
# slapos.toolbox==0.26
# slapos.toolbox==0.26
.1
atomize = 0.1.1
atomize = 0.1.1
# Required by:
# Required by:
# slapos.toolbox==0.26
# slapos.toolbox==0.26
.1
feedparser = 5.1.2
feedparser = 5.1.2
# Required by:
# Required by:
...
@@ -111,18 +111,18 @@ inotifyx = 0.2.0
...
@@ -111,18 +111,18 @@ inotifyx = 0.2.0
netifaces = 0.8
netifaces = 0.8
# Required by:
# Required by:
# slapos.toolbox==0.26
# slapos.toolbox==0.26
.1
paramiko = 1.7.7.2
paramiko = 1.7.7.2
# Required by:
# Required by:
# slapos.toolbox==0.26
# slapos.toolbox==0.26
.1
psutil = 0.5.1
psutil = 0.5.1
# Required by:
# Required by:
# slapos.cookbook==0.58
# slapos.cookbook==0.58
# slapos.core==0.26.2
# slapos.core==0.26.2
# slapos.libnetworkcache==0.12
# slapos.libnetworkcache==0.12
# slapos.toolbox==0.26
# slapos.toolbox==0.26
.1
# supervisor==3.0a12
# supervisor==3.0a12
# zope.interface==4.0.1
# zope.interface==4.0.1
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
...
...
This diff is collapsed.
Click to expand it.
stack/slapos.cfg
View file @
fbfd51a2
...
@@ -53,8 +53,5 @@ eggs =
...
@@ -53,8 +53,5 @@ eggs =
slapos.cookbook
slapos.cookbook
[versions]
[versions]
# Use patched hexagonit.recipe.download from
# https://github.com/SlapOS/hexagonit.recipe.download
hexagonit.recipe.download = 1.5.1-dev-slapos-002
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-006
zc.buildout = 1.6.0-dev-SlapOS-006
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