Commit 63500952 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge remote-tracking branch 'origin/master' into erp5-cluster

parents 59743897 8910af9d
......@@ -123,7 +123,7 @@ setuptools = 1.4.2
pyOpenSSL = 0.13.1
Jinja2 = 2.7.2
MarkupSafe = 0.21
MarkupSafe = 0.23
Werkzeug = 0.9.4
buildout-versions = 1.7
cmd2 = 0.6.7
......@@ -152,11 +152,11 @@ cliff = 1.6.1
# Required by:
# slapos.core==1.0.5
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==1.0.5
requests = 2.2.1
requests = 2.3.0
# Required by:
# slapos.core==1.0.5
......
......@@ -213,6 +213,13 @@ md5sum = c3b348c6e2031b72b11ae63fc7f805c2
recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2
md5sum = c5f4f1fb4ba7766eedbc9489e81f3be2
configure-options =
--disable-specs
--without-xmlto
--without-fop
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
[recordproto]
recipe = slapos.recipe.cmmi
......@@ -241,7 +248,7 @@ recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2
md5sum = a2a861f142c3b4367f14fc14239fc1f7
environment =
PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
......@@ -251,7 +258,7 @@ recipe = slapos.recipe.cmmi
url = http://www.x.org/releases/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2
md5sum = 6851da5dae0a6cf5f7c9b9e2b05dd3b4
environment =
PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
......
......@@ -60,7 +60,7 @@ class Recipe(object):
try:
with open(self.storage_path) as f:
passwd = f.read()
except IOError, e:
except IOError as e:
if e.errno != errno.ENOENT:
raise
passwd = None
......@@ -79,11 +79,11 @@ class Recipe(object):
if self.storage_path:
try:
os.unlink(self.storage_path)
except OSError, e:
except OSError as e:
if e.errno != errno.ENOENT:
raise
fd = os.open(self.storage_path,
os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0600)
os.O_CREAT | os.O_EXCL | os.O_WRONLY | os.O_TRUNC, 0600)
try:
os.write(fd, self.passwd)
finally:
......
......@@ -234,7 +234,7 @@ lock-file = 2.0
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.35.1
......
......@@ -69,7 +69,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.34.0
......
......@@ -288,7 +288,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.35.1
......
......@@ -170,7 +170,7 @@ lock-file = 2.0
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.35.1
......
......@@ -206,7 +206,7 @@ lock-file = 2.0
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.35.1
......
......@@ -63,7 +63,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.14
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.cookbook==0.24
......
......@@ -63,7 +63,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.14
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.cookbook==0.24
......
......@@ -86,7 +86,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.28.5
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# erp5.util==0.4.7
......
......@@ -186,7 +186,7 @@ pytz =
setuptools = 2.2
Jinja2 = 2.7.2
MarkupSafe = 0.21
MarkupSafe = 0.23
PyXML = 0.8.5
Werkzeug = 0.9.4
buildout-versions = 1.7
......@@ -228,7 +228,7 @@ lock-file = 2.0
# Required by:
# slapos.core==1.0.5
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# cffi==0.8.2
......@@ -236,7 +236,7 @@ pycparser = 2.10
# Required by:
# slapos.core==1.0.5
requests = 2.2.1
requests = 2.3.0
# Required by:
# slapos.core==1.0.5
......
......@@ -134,7 +134,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.34.0
......
......@@ -68,7 +68,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.35.1
......
......@@ -107,7 +107,7 @@ signature-certificate-list =
# Required by:
# slapos.core==0.33.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.cookbook==0.71.1
......
......@@ -175,7 +175,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# websockify==0.5.1
......
......@@ -114,7 +114,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.35
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.35
......
......@@ -70,7 +70,7 @@ lxml = 2.3.4
# Required by:
# slapos.core==0.2
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.2
......
......@@ -69,7 +69,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.35.1
......
......@@ -162,7 +162,7 @@ hexagonit.recipe.download = 1.6nxd002
# Required by:
# slapos.core==0.34
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.34
......
......@@ -183,7 +183,7 @@ lock-file = 2.0
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.35.1
......
......@@ -51,7 +51,7 @@ mode = 0644
setuptools = 2.2
Jinja2 = 2.7.2
MarkupSafe = 0.21
MarkupSafe = 0.23
Werkzeug = 0.9.4
buildout-versions = 1.7
cffi = 0.8.2
......@@ -97,7 +97,7 @@ netaddr = 0.7.11
# Required by:
# slapos.core==1.0.5
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# cffi==0.8.2
......@@ -109,7 +109,7 @@ pytz = 2014.2
# Required by:
# slapos.core==1.0.5
requests = 2.2.1
requests = 2.3.0
# Required by:
# slapos.cookbook==0.87
......
......@@ -154,7 +154,7 @@ itsdangerous = 0.23
lxml = 3.2.3
meld3 = 0.6.10
netaddr = 0.7.10
netifaces = 0.10.2
netifaces = 0.10.3
pytz = 2013d
requests = 1.2.3
slapos.cookbook = 0.83.1
......
......@@ -184,7 +184,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==1.0.0
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.cookbook==0.85
......
......@@ -89,7 +89,7 @@ hexagonit.recipe.download = 1.6nxd002
# Required by:
# slapos.core==0.34
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.34.0
......
......@@ -112,12 +112,15 @@ The way to do that is to send a new parameter to your runner instance, using the
To create the frontend, you now have to wait the slaprunner to be processed.
You can define the type of your backend using "custom-frontend-backend-type". eg: zope
If you deploy a server, which uses basic auth, you also have to declare the parameter "custom-frontend-basic-auth" as true, or your slaprunner instance won't show as correctly instanciated.
Example :
<?xml version='1.0' encoding='utf-8'?>
<instance>
<parameter id="custom-frontend-backend-url">http(s)://[THE_IPV6_ADDRESS]:PORT</parameter>
<parameter id="custom-frontend-backend-type">zope</parameter>
<parameter id="custom-frontend-basic-auth">true</parameter>
</instance>
......
......@@ -44,7 +44,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
md5sum = 9f32b1bcd32e90950ee94e8d41dfdcd7
md5sum = b30d71f2f0abfecc2638fe6b804f3c43
mode = 0644
[instance-runner-import]
......@@ -80,7 +80,7 @@ mode = 0644
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/nginx_conf.in
download-only = true
md5sum = 67d2ce92b4ad6dca6eaf69eeb2c2734c
md5sum = 7c0608eafb5c6998846851744a70b3de
filename = nginx_conf.in
mode = 0644
......
......@@ -59,7 +59,7 @@ offline = true
# Internaly, the frontend will be asked to listen on the IPv6
# with port X + 10000, to match NAT rules of Qemu.
[request-custom-frontend]
recipe = slapos.cookbook:request
recipe = slapos.cookbook:requestoptional
software-url = {{ slapparameter_dict.get('custom-frontend-software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') }}
software-type = {{ slapparameter_dict.get('custom-frontend-software-type', 'RootSoftwareInstance') }}
slave = true
......@@ -71,12 +71,18 @@ cert-file = $${slap-connection:cert-file}
computer-id = $${slap-connection:computer-id}
partition-id = $${slap-connection:partition-id}
{% if slapparameter_dict.get('custom-frontend-instance-guid') -%}
{%- if slapparameter_dict.get('custom-frontend-instance-guid') -%}
sla = instance_guid
sla-instance_guid = $${slap-parameter:frontend-instance-guid}
{% endif -%}
{% set custom_frontend_backend_type = slapparameter_dict.get('custom-frontend-backend-type')%}
{% if custom_frontend_backend_type %}
config = url type
config-type = {{ custom_frontend_backend_type }}
{% else %}
config = url
{% endif -%}
config-url = {{ slapparameter_dict.get('custom-frontend-backend-url') }}
return = site_url domain
......@@ -92,7 +98,7 @@ curl_path = {{ curl_executable_location }}
[publish-connection-informations]
custom-frontend-url = https://$${request-custom-frontend:connection-domain}
{% endif -%}
{% endif %}
# Create all needed directories
[directory]
......@@ -337,7 +343,7 @@ path_pid = $${directory:run}/gunicorn.pid
recipe = slapos.cookbook:wrapper
command-line = $${gunicorn:bin_gunicorn} slapos.runner:app -p $${gunicorn:path_pid} -b unix:$${gunicorn:socket} -e RUNNER_CONFIG=$${slaprunner:slapos.cfg} --preload
wrapper-path = $${gunicorn:bin_launcher}
environment = PATH=$${environ:PATH}
environment = PATH=$${environ:PATH}:${git:location}/bin/
RUNNER_CONFIG=$${slaprunner:slapos.cfg}
[gunicorn-graceful]
......
......@@ -13,6 +13,7 @@ events {
http {
default_type application/octet-stream;
access_log {{ param_nginx_frontend['path_access_log'] }} combined;
client_max_body_size 10M;
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
......
......@@ -46,11 +46,30 @@
"description": "return an ipv4 frontend of the given ipv6(+optional port)",
"type": "string"
},
"custom-frontend-backend-type": {
"description": "The type of the frontend slave instance to ask",
"type": "string"
},
"custom-frontend-basic-auth": {
"description": "if the ip given with 'custom-frontend-backend-url' is secure, set it to true for the promise do not fail",
"type": "boolean",
"default": "false"
}
},
"custom-frontend-instance-guid": {
"description": "Instance guid of the frontend you whish to use",
"type": "string",
"default": "none"
},
"custom-frontend-software-type": {
"description": "SoftwareType of the frontend you request",
"default": "RootSoftwareInstance",
"type": "string"
},
"custom-frontend-software-url": {
"description": "Software Url of the frontend you request",
"default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
"type": "string"
},
"monitor-port": {
"description": "allow to manually change the port on wich the apache server running monitoring interface is listening. The default value for the webrunner is different from the default value of the standalone stack-monitor server",
"type": "integer",
......
......@@ -212,7 +212,7 @@ slapos.recipe.build = 0.11.5
slapos.recipe.cmmi = 0.2
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.39.1
slapos.toolbox = 0.39.2
smmap = 0.8.2
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
......@@ -239,7 +239,7 @@ hexagonit.recipe.download = 1.7nxd002
# Required by:
# slapos.core==0.34
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.34.0
......
......@@ -346,7 +346,7 @@ feedparser = 5.1.3
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.34.0
......
......@@ -71,7 +71,7 @@ Flask = 0.9
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.core==0.35.1
......
......@@ -99,7 +99,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.33.1
......
......@@ -226,7 +226,7 @@ lock-file = 2.0
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.34.0
......
......@@ -93,7 +93,7 @@ develop +=
[versions]
Jinja2 = 2.7.2
MarkupSafe = 0.21
MarkupSafe = 0.23
Paste = 1.7.5.1
PasteScript = 1.7.5
WSGIUtils = 0.7
......@@ -109,7 +109,7 @@ lxml = 3.3.5
meld3 = 1.0.0
mr.developer = 1.30
netaddr = 0.7.11
netifaces = 0.10.2
netifaces = 0.10.3
plone.recipe.command = 1.1
psutil = 2.1.1
pyOpenSSL = 0.14
......@@ -117,7 +117,7 @@ pyparsing = 2.0.2
python-magic = 0.4.6
pytz = 2014.2
rdiff-backup = 1.0.5
requests = 2.2.1
requests = 2.3.0
six = 1.6.1
slapos.core = 1.0.5
slapos.recipe.build = 0.12
......
......@@ -742,14 +742,14 @@ python-ldap = 2.4.15
python-magic = 0.4.6
python-memcached = 1.53
qrcode = 4.0.4
requests = 2.2.1
requests = 2.3.0
restkit = 4.2.2
rtjp-eventlet = 0.3.2
six = 1.6.1
slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2
slapos.recipe.template = 2.5
slapos.toolbox = 0.39.1
slapos.toolbox = 0.39.2
smmap = 0.8.2
socketpool = 0.5.3
spyne = 2.10.10
......
......@@ -151,7 +151,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.24
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.23
......
......@@ -352,7 +352,7 @@ feedparser = 5.1.3
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.34.0
......
......@@ -360,7 +360,7 @@ netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.10.2
netifaces = 0.10.3
# Required by:
# slapos.toolbox==0.33.1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment