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
isaak yansane-sisk
slapos
Commits
5f2f8f49
Commit
5f2f8f49
authored
Jun 10, 2016
by
isaak yansane-sisk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use X-FORWARDED-FOR header so client's actual IP is visible instead of haproxy's
parent
b5f8ce47
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
stack/erp5/apache.conf.in
stack/erp5/apache.conf.in
+1
-1
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-3
stack/erp5/haproxy.cfg.in
stack/erp5/haproxy.cfg.in
+3
-0
No files found.
stack/erp5/apache.conf.in
View file @
5f2f8f49
...
...
@@ -58,7 +58,7 @@ SSLCARevocationFile {{ parameter_dict['crl'] }}
ErrorLog "{{ parameter_dict['error-log'] }}"
# Default apache log format with request time in microsecond at the end
LogFormat "%
h
%l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
LogFormat "%
{X-Forwarded-For}i
%l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
CustomLog "{{ parameter_dict['access-log'] }}" combined
<Directory />
...
...
stack/erp5/buildout.cfg
View file @
5f2f8f49
...
...
@@ -370,12 +370,12 @@ md5sum = ec9321514674c084e509ca070763b4a1
[template-apache-conf]
<= download-base
filename = apache.conf.in
md5sum =
cbe53c1879db9601a521e3ce1d546116
md5sum =
30e5560c216042bc965959a78d43f7c4
[template-haproxy-cfg]
<= download-base
filename = haproxy.cfg.in
md5sum =
3defd473e2cea17ae36bba7752494858
md5sum =
5f85c35ebf3d08d408df0ce9935c5424
[bt5-repository]
# Format:
...
...
stack/erp5/haproxy.cfg.in
View file @
5f2f8f49
...
...
@@ -35,6 +35,9 @@ defaults
# is configured with maxconn to 1, without this option browsers are unable
# to render a page
option forceclose
# Use "option forwardfor" so that client's actual IP is used rather than the IP
# of the load balancer
option forwardfor
{% for name, (port, backend_list) in sorted(parameter_dict['backend-dict'].iteritems()) -%}
listen {{ name }}
...
...
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