libretic/ansible-role-apache
6
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-apache synced 2025-01-09 11:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixing remoteip issues.

Browse source
This commit is contained in:
Ivan Grynenko 2016-07-06 15:17:54 +10:00
parent f79b589622
commit 844482e8b8
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
group_vars/all.yml
View file

@ -85,8 +85,8 @@ apache_vhosts:
ServerSignature Off ServerSignature Off
ProxyTimeout 600 ProxyTimeout 600
ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/html/{{ server_hostname }}/$1" ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/html/{{ server_hostname }}/$1"
LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combinedlog
CustomLog "/var/log/httpd/{{ server_hostname }}_access.log" combined CustomLog "/var/log/httpd/{{ server_hostname }}_access.log" combinedlog
<Proxy fcgi://localhost:9000> <Proxy fcgi://localhost:9000>
ProxySet timeout=600 ProxySet timeout=600
</Proxy> </Proxy>
@ -172,6 +172,18 @@ nginx_vhosts:
access_log: "/var/log/nginx/{{ server_hostname }}_access.log" access_log: "/var/log/nginx/{{ server_hostname }}_access.log"
error_log: "/var/log/nginx/{{ server_hostname }}_error.log" error_log: "/var/log/nginx/{{ server_hostname }}_error.log"
extra_parameters: | extra_parameters: |
location ~ ^/sites/.*/files/styles/ {
try_files $uri @rewrite;
}
location ~ ^/sites/default/files/ {
try_files $uri @rewrite;
}
location ~* \.(gif|jpg|jpeg|png|ico|bmp|js|css|pdf|doc|webp|woff|ico|js|css|svg)(\?[a-zA-Z0-9\.\-_,])?$ {
expires max;
log_not_found off;
add_header Cache-Control "public";
add_header X-Cache $upstream_cache_status;
}
location = /favicon.ico { location = /favicon.ico {
log_not_found off; log_not_found off;
access_log off; access_log off;
@ -188,6 +200,7 @@ nginx_vhosts:
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
add_header X-Cache $upstream_cache_status; add_header X-Cache $upstream_cache_status;
add_header X-Loaded "/"; add_header X-Loaded "/";
add_header X-Your-IP $remote_addr;
} }
location ~ \.php$ { location ~ \.php$ {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
@ -196,6 +209,7 @@ nginx_vhosts:
proxy_pass http://127.0.0.1:{{ apache_listen_port }}; proxy_pass http://127.0.0.1:{{ apache_listen_port }};
add_header X-Cache $upstream_cache_status; add_header X-Cache $upstream_cache_status;
add_header X-Loaded "php"; add_header X-Loaded "php";
add_header X-Your-IP $remote_addr;
} }
location = /backup { location = /backup {
deny all; deny all;
@ -207,18 +221,7 @@ nginx_vhosts:
location ~ \..*/.*\.php$ { location ~ \..*/.*\.php$ {
return 403; return 403;
} }
location ~ ^/sites/.*/files/styles/ {
try_files $uri @rewrite;
}
location ~ ^/sites/default/files/ {
try_files $uri @rewrite;
}
location ~* \.(gif|jpg|jpeg|png|ico|bmp|js|css|pdf|doc|webp|woff|ico|js|css|svg)(\?[a-zA-Z0-9\.\-_,])?$ {
expires max;
log_not_found off;
add_header Cache-Control "public";
add_header X-Cache $upstream_cache_status;
}
location ~ /\. { location ~ /\. {
access_log off; access_log off;
log_not_found off; log_not_found off;

3
roles/ansible-role-apache/templates/90-remoteip.conf.j2
View file

@ -6,6 +6,5 @@
LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
RemoteIPHeader X-Real-IP RemoteIPHeader X-Real-IP
RemoteIPInternalProxy 127.0.0.1 RemoteIPInternalProxy 127.0.0.1/8
RemoteIPTrustedProxy 127.0.0.1
</IfModule> </IfModule>