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
Lu Xu
slapos
Commits
fd19d98d
Commit
fd19d98d
authored
Mar 28, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
6345aeed
1a632ff3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
26 deletions
+38
-26
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+5
-3
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+3
-3
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+1
-1
stack/erp5/instance-postfix.cfg.in
stack/erp5/instance-postfix.cfg.in
+11
-2
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+2
-1
stack/slapos.cfg
stack/slapos.cfg
+16
-16
No files found.
software/caddy-frontend/test/test.py
View file @
fd19d98d
...
@@ -590,11 +590,11 @@ class TestHandler(BaseHTTPRequestHandler):
...
@@ -590,11 +590,11 @@ class TestHandler(BaseHTTPRequestHandler):
self.send_response(200)
self.send_response(200)
prefix = '
x
-
reply
-
header
-
'
prefix = '
x
-
reply
-
header
-
'
leng
ht
= len(prefix)
leng
th
= len(prefix)
for key, value in self.headers.dict.items():
for key, value in self.headers.dict.items():
if key.startswith(prefix):
if key.startswith(prefix):
self.send_header(
self.send_header(
'
-
'.join([q.capitalize() for q in key[leng
ht
:].split('
-
')]),
'
-
'.join([q.capitalize() for q in key[leng
th
:].split('
-
')]),
value.strip()
value.strip()
)
)
...
@@ -2638,7 +2638,9 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
...
@@ -2638,7 +2638,9 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
)
)
finally:
finally:
self.getSupervisorRPCServer().supervisor.startProcess(caddy_process_name)
self.getSupervisorRPCServer().supervisor.startProcess(caddy_process_name)
time.sleep(2) # give few moments for caddy to start
# give few moments for caddy to start
# XXX: convert to a loop which awaits caddy to be ready
time.sleep(2)
# END: check stale-if-error support
# END: check stale-if-error support
result_direct = self.fakeHTTPResult(
result_direct = self.fakeHTTPResult(
...
...
stack/erp5/buildout.hash.cfg
View file @
fd19d98d
...
@@ -50,7 +50,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce
...
@@ -50,7 +50,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce
[template-postfix]
[template-postfix]
filename = instance-postfix.cfg.in
filename = instance-postfix.cfg.in
md5sum =
805d997fcac266b0958c1c385729b32d
md5sum =
d920170577b611f973145c5807b01fce
[template-postfix-master-cf]
[template-postfix-master-cf]
filename = postfix_master.cf.in
filename = postfix_master.cf.in
...
@@ -66,7 +66,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
...
@@ -66,7 +66,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
9009939093730fb8219cbe7092dda9ab
md5sum =
1f88fb841394a1d24b7cc01f966c7b21
[monitor-template-dummy]
[monitor-template-dummy]
filename = dummy.cfg
filename = dummy.cfg
...
@@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
...
@@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
6c463effae65d8269586dfa51bd3f1f1
md5sum =
4e03b3fba30162019eae76132555dcde
[template-zeo]
[template-zeo]
filename = instance-zeo.cfg.in
filename = instance-zeo.cfg.in
...
...
stack/erp5/instance-erp5.cfg.in
View file @
fd19d98d
...
@@ -96,7 +96,7 @@ backup-caucased = ${:srv}/backup/caucased
...
@@ -96,7 +96,7 @@ backup-caucased = ${:srv}/backup/caucased
{{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
{{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
{{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099, 'max-slowqueries-threshold': monitor_dict.get('max-slowqueries-threshold', 1000), 'slowest-query-threshold': monitor_dict.get('slowest-query-threshold', ''), 'test-database-amount': test_runner_total_database_count}, {'database-list': True, 'test-database-list': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
{{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099, 'max-slowqueries-threshold': monitor_dict.get('max-slowqueries-threshold', 1000), 'slowest-query-threshold': monitor_dict.get('slowest-query-threshold', ''), 'test-database-amount': test_runner_total_database_count}, {'database-list': True, 'test-database-list': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
{% if has_posftix -%}
{% if has_posftix -%}
{{ request('smtp', 'postfix', 'smtp', {'tcpv4-port': 2025, 'smtpd-sasl-user': 'erp5@nowhere'}, key_config={'smtpd-sasl-password': 'publish-early:smtpd-sasl-password'}) }}
{{ request('smtp', 'postfix', 'smtp', {'tcpv4-port': 2025, 'smtpd-sasl-user': 'erp5@nowhere'}, key_config={'smtpd-sasl-password': 'publish-early:smtpd-sasl-password'
, 'monitor-passwd': 'monitor-htpasswd:passwd'
}) }}
{%- else %}
{%- else %}
[request-smtp]
[request-smtp]
# Placeholder smtp service URL
# Placeholder smtp service URL
...
...
stack/erp5/instance-postfix.cfg.in
View file @
fd19d98d
...
@@ -35,6 +35,7 @@ etc-cyrus = ${:etc}/cyrus
...
@@ -35,6 +35,7 @@ etc-cyrus = ${:etc}/cyrus
run = ${:etc}/run
run = ${:etc}/run
bin = ${buildout:directory}/bin
bin = ${buildout:directory}/bin
usr = ${buildout:directory}/usr
usr = ${buildout:directory}/usr
srv = ${buildout:directory}/srv
var = ${buildout:directory}/var
var = ${buildout:directory}/var
var-lib = ${:var}/lib
var-lib = ${:var}/lib
var-lib-postfix = ${:var-lib}/postfix
var-lib-postfix = ${:var-lib}/postfix
...
@@ -62,7 +63,7 @@ var-spool-postfix-trace = ${:var-spool-postfix}/trace
...
@@ -62,7 +63,7 @@ var-spool-postfix-trace = ${:var-spool-postfix}/trace
# Generate rdiff exclude file
# Generate rdiff exclude file
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
mode = 644
mode = 644
template = {{ 'inline:{{ "
${directory:log}/
**\\n" }}' }}
template = {{ 'inline:{{ "**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
rendered = ${directory:srv}/exporter.exclude
{% if divert -%}
{% if divert -%}
...
@@ -269,7 +270,15 @@ recipe = slapos.cookbook:wrapper
...
@@ -269,7 +270,15 @@ recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:promise}/check-computer-memory
wrapper-path = ${directory:promise}/check-computer-memory
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ tcpv4_port + 2 }}
monitor-title = {{ slapparameter_dict['name'] }}
password = {{ slapparameter_dict['monitor-passwd'] }}
[buildout]
[buildout]
extends = {{ logrotate_cfg }}
extends =
{{ logrotate_cfg }}
{{ parameter_dict['template-monitor'] }}
parts =
parts =
{{ part_list | join('\n ') }}
{{ part_list | join('\n ') }}
stack/erp5/instance.cfg.in
View file @
fd19d98d
...
@@ -18,6 +18,7 @@ postfix-location = {{ postfix_location }}
...
@@ -18,6 +18,7 @@ postfix-location = {{ postfix_location }}
template-postfix-aliases = {{ template_postfix_aliases }}
template-postfix-aliases = {{ template_postfix_aliases }}
template-postfix-main-cf = {{ template_postfix_main_cf }}
template-postfix-main-cf = {{ template_postfix_main_cf }}
template-postfix-master-cf = {{ template_postfix_master_cf }}
template-postfix-master-cf = {{ template_postfix_master_cf }}
template-monitor = {{ dumps(template_monitor) }}
[dynamic-template-postfix]
[dynamic-template-postfix]
< = jinja2-template-base
< = jinja2-template-base
...
@@ -197,7 +198,7 @@ mariadb = dynamic-template-mariadb:rendered
...
@@ -197,7 +198,7 @@ mariadb = dynamic-template-mariadb:rendered
balancer = dynamic-template-balancer:rendered
balancer = dynamic-template-balancer:rendered
postfix = dynamic-template-postfix:rendered
postfix = dynamic-template-postfix:rendered
zodb-zeo = dynamic-template-zeo:rendered
zodb-zeo = dynamic-template-zeo:rendered
zodb-neo = neo
-storage-mysql
:rendered
zodb-neo = neo:rendered
zope = dynamic-template-zope:rendered
zope = dynamic-template-zope:rendered
jupyter = dynamic-template-jupyter:rendered
jupyter = dynamic-template-jupyter:rendered
...
...
stack/slapos.cfg
View file @
fd19d98d
...
@@ -142,7 +142,7 @@ slapos.libnetworkcache = 0.16
...
@@ -142,7 +142,7 @@ slapos.libnetworkcache = 0.16
slapos.rebootstrap = 4.1
slapos.rebootstrap = 4.1
slapos.recipe.build = 0.40
slapos.recipe.build = 0.40
slapos.recipe.cmmi = 0.10
slapos.recipe.cmmi = 0.10
slapos.toolbox = 0.9
0
slapos.toolbox = 0.9
1
stevedore = 1.21.0
stevedore = 1.21.0
subprocess32 = 3.5.3
subprocess32 = 3.5.3
unicodecsv = 0.14.1
unicodecsv = 0.14.1
...
@@ -154,7 +154,7 @@ paramiko = 2.1.3
...
@@ -154,7 +154,7 @@ paramiko = 2.1.3
Flask = 0.12
Flask = 0.12
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
GitPython = 2.1.11
GitPython = 2.1.11
# Required by:
# Required by:
...
@@ -166,23 +166,23 @@ gitdb2 = 2.0.5
...
@@ -166,23 +166,23 @@ gitdb2 = 2.0.5
smmap2 = 2.0.5
smmap2 = 2.0.5
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
PyRSS2Gen = 1.1
PyRSS2Gen = 1.1
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
apache-libcloud = 2.4.0
apache-libcloud = 2.4.0
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
atomize = 0.2.0
atomize = 0.2.0
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
croniter = 0.3.25
croniter = 0.3.25
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
dnspython = 1.15.0
dnspython = 1.15.0
# Required by:
# Required by:
...
@@ -190,11 +190,11 @@ dnspython = 1.15.0
...
@@ -190,11 +190,11 @@ dnspython = 1.15.0
enum34 = 1.1.6
enum34 = 1.1.6
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
erp5.util = 0.4.51
erp5.util = 0.4.51
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
feedparser = 5.2.1
feedparser = 5.2.1
# Required by:
# Required by:
...
@@ -218,7 +218,7 @@ ipaddress = 1.0.18
...
@@ -218,7 +218,7 @@ ipaddress = 1.0.18
jsonschema = 3.0.0a3
jsonschema = 3.0.0a3
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
lockfile = 0.12.2
lockfile = 0.12.2
# Required by:
# Required by:
...
@@ -231,11 +231,11 @@ netifaces = 0.10.4
...
@@ -231,11 +231,11 @@ netifaces = 0.10.4
packaging = 16.8
packaging = 16.8
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
passlib = 1.7.1
passlib = 1.7.1
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
pyasn1 = 0.4.5
pyasn1 = 0.4.5
# Required by:
# Required by:
...
@@ -243,15 +243,15 @@ pyasn1 = 0.4.5
...
@@ -243,15 +243,15 @@ pyasn1 = 0.4.5
pycparser = 2.17
pycparser = 2.17
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
pycurl = 7.43.0
pycurl = 7.43.0
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
python-dateutil = 2.7.3
python-dateutil = 2.7.3
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
rpdb = 0.1.5
rpdb = 0.1.5
# Required by:
# Required by:
...
@@ -259,7 +259,7 @@ rpdb = 0.1.5
...
@@ -259,7 +259,7 @@ rpdb = 0.1.5
supervisor = 3.3.3
supervisor = 3.3.3
# Required by:
# Required by:
# slapos.toolbox==0.9
0
# slapos.toolbox==0.9
1
tzlocal = 1.5.1
tzlocal = 1.5.1
# Required by:
# Required by:
...
...
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