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
Steven Gueguen
slapos
Commits
44d66ced
Commit
44d66ced
authored
Sep 14, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into mysql
parents
a3ced9b1
89e3f5d0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
7 deletions
+30
-7
CHANGES.txt
CHANGES.txt
+15
-1
setup.py
setup.py
+1
-1
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+11
-1
slapos/recipe/erp5/template/apache.zope.conf.in
slapos/recipe/erp5/template/apache.zope.conf.in
+3
-3
slapos/recipe/erp5/template/logrotate_entry.in
slapos/recipe/erp5/template/logrotate_entry.in
+0
-1
No files found.
CHANGES.txt
View file @
44d66ced
Changes
Changes
=======
=======
0.21 (unreleased)
0.23 (unreleased)
-----------------
* No change yet.
0.22 (2011-09-12)
-----------------
* Fix haproxy setup for erp5 [Sebastien Robin]
0.21 (2011-09-12)
-----------------
-----------------
* Update PHP configuration to set session and date options.
* Update PHP configuration to set session and date options.
[Alain Takoudjou Kamdem]
[Alain Takoudjou Kamdem]
* Improve logrotate policy and haproxy config for erp5
[Sebastien Robin]
0.20 (2011-09-07)
0.20 (2011-09-07)
-----------------
-----------------
...
...
setup.py
View file @
44d66ced
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'0.2
1
-dev'
version
=
'0.2
3
-dev'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
slapos/recipe/erp5/__init__.py
View file @
44d66ced
...
@@ -546,13 +546,23 @@ class Recipe(BaseSlapRecipe):
...
@@ -546,13 +546,23 @@ class Recipe(BaseSlapRecipe):
}
}
def
installHaproxy
(
self
,
ip
,
port
,
name
,
server_check_path
,
url_list
):
def
installHaproxy
(
self
,
ip
,
port
,
name
,
server_check_path
,
url_list
):
server_template
=
""" server %(name)s %(address)s cookie %(name)s check inter 20s rise 2 fall 4"""
# inter must be quite short in order to detect quickly an unresponsive node
# and to detect quickly a node which is back
# rise must be minimal possible : 1, indeed, a node which is back don't need
# to sleep more time and we can give him work immediately
# fall should be quite sort. with inter at 3, and fall at 2, a node will be
# considered as dead after 6 seconds.
# maxconn should be set as the maximum thread we have per zope, like this
# haproxy will manage the queue of request with the possibility to
# move a request to another node if the initially selected one is dead
server_template
=
""" server %(name)s %(address)s cookie %(name)s check inter 3s rise 1 fall 2 maxconn %(cluster_zope_thread_amount)s"""
config
=
dict
(
name
=
name
,
ip
=
ip
,
port
=
port
,
config
=
dict
(
name
=
name
,
ip
=
ip
,
port
=
port
,
server_check_path
=
server_check_path
,)
server_check_path
=
server_check_path
,)
i
=
1
i
=
1
server_list
=
[]
server_list
=
[]
for
url
in
url_list
:
for
url
in
url_list
:
server_list
.
append
(
server_template
%
dict
(
name
=
'%s_%s'
%
(
name
,
i
),
server_list
.
append
(
server_template
%
dict
(
name
=
'%s_%s'
%
(
name
,
i
),
cluster_zope_thread_amount
=
self
.
options
.
get
(
'cluster_zope_thread_amount'
,
1
),
address
=
url
))
address
=
url
))
i
+=
1
i
+=
1
config
[
'server_text'
]
=
'
\
n
'
.
join
(
server_list
)
config
[
'server_text'
]
=
'
\
n
'
.
join
(
server_list
)
...
...
slapos/recipe/erp5/template/apache.zope.conf.in
View file @
44d66ced
...
@@ -34,9 +34,9 @@ RequestHeader unset REMOTE_USER
...
@@ -34,9 +34,9 @@ RequestHeader unset REMOTE_USER
# Log configuration
# Log configuration
ErrorLog "%(error_log)s"
ErrorLog "%(error_log)s"
LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combine
d
# Default apache log format with request time in microsecond at the en
d
LogFormat "%%h %%
{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
LogFormat "%%h %%
l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\" %%D" combined
CustomLog "%(access_log)s" com
mon
CustomLog "%(access_log)s" com
bined
# Directory protection
# Directory protection
<Directory />
<Directory />
...
...
slapos/recipe/erp5/template/logrotate_entry.in
View file @
44d66ced
%(file_list)s {
%(file_list)s {
daily
daily
dateext
dateext
rotate 30
compress
compress
notifempty
notifempty
sharedscripts
sharedscripts
...
...
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