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
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
Roque
slapos
Commits
4483ecb5
Commit
4483ecb5
authored
May 30, 2016
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
bd1049cd
4a79cc25
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
67 additions
and
16 deletions
+67
-16
CHANGES.txt
CHANGES.txt
+29
-5
setup.py
setup.py
+1
-1
software/apache-frontend/instance-apache-input-schema.json
software/apache-frontend/instance-apache-input-schema.json
+9
-7
software/apache-frontend/instance-slave-apache-input-schema.json
...e/apache-frontend/instance-slave-apache-input-schema.json
+2
-1
software/erp5/software.cfg.json
software/erp5/software.cfg.json
+21
-0
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/instance-resilient.cfg.jinja2
software/slaprunner/instance-resilient.cfg.jinja2
+3
-0
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
CHANGES.txt
View file @
4483ecb5
Changes
=======
1.0.31 (2016-05-30)
-------------------
* Implement cross recipe cache for registerComputerPartition
* Fixup! workarround for long shebang (place script on bin)
1.0.30 (2016-05-23)
-------------------
* Implement a workarround for long shebang
* Implement Validation for user inputs ssl certificates
1.0.25 (2016-04-15)
-------------------
* fixup slap configuration: provide instance and root instance title
1.0.22 (2016-04-01)
-------------------
* slap configuration: provide instance and root instance title
1.0.16 (2015-10.27)
-------------------
* kvm recipe: fix bugs dowload image and disk creation
1.0.14 (2015-10.26)
-------------------
* kvm recipe: Allow to set keyboard layout language used by qemu and VNC
* simplehttpserver-recipe: fix encoding error
0.103 (2015-07-24)
------------------
* kvm: fix issues with boolean parameters and add 'qed' in external disk format list.
* simplehttpserver-recipe: Add support for POST method which only get content and save into specified file.
0.102 (2015-05-22)
------------------
* kvm-recipe: vm of kvm-cluster can get ipv4/hostname of all other vm in the same cluster
* simplehttpserver-recipe: simple http server to serve files
0.101 (2015-04-29)
------------------
* kvm recipe: new parameters: external-disk-format, numa and cpu-options.
* kvm recipe: allow guest VM to connect to host http service via a local predefined ipv4 address (guestfwd).
0.100 (2015-04-20)
------------------
* re6stnet recipe: re6st-registry log can now be reopened with SIGUSR1
* re6stnet recipe: re6st certificate generation is improved.
0.99 (2015-04-10)
-----------------
* re6stnet: new recipe to deploy re6st registry (re6st master) with slapos.
0.98 (2015-04-09)
-----------------
* shellinabox: do not run in debug mode, it is much slower !
0.97 (2015-03-26)
-----------------
* switch softwaretype recipe: the recipe is backward compatible with old slapos node packages.
* kvm recipe: Avoid getting wrong storage path when creating kvm external disk
0.96 (2015-03-20)
-----------------
* slap configuration: recipe can read from master network information releated to a tap interface
* slap configuration: recipe will setup data folder in DATA directory of computer partition if disk is mounted
* switch softwaretype recipe: also generate tap network information when they exist
...
...
setup.py
View file @
4483ecb5
...
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
os
version
=
'1.0.31
.dev0
'
version
=
'1.0.31'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
software/apache-frontend/instance-apache-input-schema.json
View file @
4483ecb5
...
...
@@ -5,8 +5,8 @@
"title"
:
"Input Parameters"
,
"properties"
:
{
"public-ipv4"
:
{
"title"
:
"
Backend URL
"
,
"description"
:
"
Url of the backend
"
,
"title"
:
"
Public IPv4
"
,
"description"
:
"
Public IPv4 that will be provided to Slaves to configure DNS.
"
,
"type"
:
"string"
},
"-frontend-authorized-slave-string"
:
{
...
...
@@ -16,30 +16,32 @@
},
"apache-key"
:
{
"title"
:
"Apache Key"
,
"description"
:
"Url of the Backend"
,
"description"
:
"Apache Key"
,
"textarea"
:
true
,
"type"
:
"string"
},
"apache-certificate"
:
{
"title"
:
"Apache Certificate"
,
"description"
:
"Apache Certificate"
,
"textarea"
:
true
,
"type"
:
"string"
},
"apache-ca-certificate"
:
{
"title"
:
"Apache CA Certificate"
,
"description"
:
"Apache CA Certificate"
,
"textarea"
:
true
,
"type"
:
"string"
},
"domain"
:
{
"title"
:
"Domain"
,
"description"
:
"Base Domain for create subdomains."
,
"description"
:
"Base Domain for create subdomains
(ie.: example.com)
."
,
"type"
:
"string"
,
"pattern"
:
"^([a-zA-Z0-9]([a-zA-Z0-9
\\
-]{0,61}[a-zA-Z0-9])?
\\
.)+[a-zA-Z]{2,6}$"
},
"-frontend-quantity"
:
{
"title"
:
"Frontend Replication Quantity"
,
"description"
:
"Quantity of Frontends Replicate."
,
"type"
:
"integer"
,
"default"
:
""
"type"
:
"integer"
}
}
}
software/apache-frontend/instance-slave-apache-input-schema.json
View file @
4483ecb5
...
...
@@ -7,7 +7,8 @@
"url"
:
{
"title"
:
"Backend URL"
,
"description"
:
"Url of the backend"
,
"type"
:
"string"
"type"
:
"string"
,
"pattern"
:
"^(http|https|ftp)://"
},
"custom_domain"
:
{
"title"
:
"Custom Domain"
,
...
...
software/erp5/software.cfg.json
0 → 100644
View file @
4483ecb5
{
"name"
:
"ERP5"
,
"description"
:
"ERP5, Open-Source ERP"
,
"serialisation"
:
"json-in-xml"
,
"software-type"
:
{
"default"
:
{
"title"
:
"Default"
,
"description"
:
"Default deployment of ERP5 with auto-create instance."
,
"request"
:
"instance-erp5-input-schema.json"
,
"response"
:
"instance-erp5-output-schema.json"
,
"index"
:
0
},
"create-erp5-site"
:
{
"title"
:
"Create ERP5 Site"
,
"description"
:
"Default deployment of ERP5 with automatic creation of the instance."
,
"request"
:
"instance-erp5-input-schema.json"
,
"response"
:
"instance-erp5-output-schema.json"
,
"index"
:
1
}
}
}
software/slaprunner/common.cfg
View file @
4483ecb5
...
...
@@ -92,7 +92,7 @@ mode = 0644
[template-resilient]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
md5sum =
6373b2cf3c0cee78bd858959976271d3
md5sum =
bf853ab13b564be991b42e74f631023a
filename = instance-resilient.cfg.jinja2
mode = 0644
...
...
software/slaprunner/instance-resilient.cfg.jinja2
View file @
4483ecb5
...
...
@@ -60,6 +60,9 @@ webdav_url = ${request-runner:connection-webdav_url}
public_url = ${request-runner:connection-public_url}
git_public_url = ${request-runner:connection-git_public_url}
git_private_url = ${request-runner:connection-git_private_url}
{% if slapparameter_dict.get('custom-frontend-backend-url') -%}
custom-frontend-url = https://${request-custom-frontend:connection-domain}
{% endif %}
{% for key in monitor_return -%}
{{ key }} = ${request-runner:connection-{{ key }}}
{% endfor -%}
...
...
stack/slapos.cfg
View file @
4483ecb5
...
...
@@ -135,7 +135,7 @@ requests = 2.10.0
setuptools = 19.6.2
simplejson = 3.8.2
six = 1.10.0
slapos.cookbook = 1.0.3
0
slapos.cookbook = 1.0.3
1
slapos.core = 1.3.15
slapos.extension.strip = 0.1
slapos.libnetworkcache = 0.14.5
...
...
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