Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorrobocoder <anthon.pang@gmail.com>2011-04-23 02:05:46 +0400
committerrobocoder <anthon.pang@gmail.com>2011-04-23 02:05:46 +0400
commitea6a41255388341cd6acbd7be77882c7bb128506 (patch)
tree20917a627de987904941478dbf984c4b7c668b35 /config
parent4307650700c494f94e79a3599a225d4245a479f9 (diff)
fixes #1111 - add support for IPv6 addresses (tracking, anonymization, and exclusion)
fixes #2095 - add new anonymization hook (pre-heuristics) fixes #2055 - optional IP filter when multiple proxies present fixes #1775 - SitesManager: supports CIDR notation for IP exclusion Notes: * Installer no longer checks for IPv6, so the related messages should be deleted from translations * IPv4 mapped addresses (e.g., ::ffff:127.0.0.1) are no longer re-mapped into IPv4 space * users who to query IP addresses from MySQL directly, can use the following SQL, but inet_ntoa() is limited to IPv4 addresses: {{{ select inet_ntoa(conv(hex(location_ip), 16, 10)) from piwik_log_visit; }}} * Windows: IPv6 inet_pton()/inet_ntop() not supported until php 5.3; see #2351 git-svn-id: http://dev.piwik.org/svn/trunk@4533 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'config')
-rw-r--r--config/global.ini.php20
1 files changed, 17 insertions, 3 deletions
diff --git a/config/global.ini.php b/config/global.ini.php
index 8e2b5687cc..9a8c774f9c 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -238,6 +238,15 @@ assume_secure_protocol = 0
; de facto standard (X-Forwarded-Host)
;proxy_host_headers[] = HTTP_X_FORWARDED_HOST
+; List of proxy IP addresses (or IP address ranges) to skip (if present in the above headers).
+; Generally, only required if there's more than one proxy between the visitor and the backend web server.
+;
+; Examples:
+;proxy_ips[] = 204.93.240.*
+;proxy_ips[] = 204.93.177.0/24
+;proxy_ips[] = 199.27.128.0/21
+;proxy_ips[] = 173.245.48.0/20
+
; The release server is an essential part of the Piwik infrastructure/ecosystem
; to provide the latest software version.
latest_version_url = http://piwik.org/latest.zip
@@ -311,9 +320,14 @@ campaign_keyword_var_name = "piwik_kwd,utm_term"
; maximum length of a Page Title or a Page URL recorded in the log_action.name table
page_maximum_length = 1024;
-; number of octets in IP address to mask, in order to anonymize a visitor's IP address
-; if the AnonymizeIP plugin is deactivated, this value is ignored
-; for IPv4 addresses, valid values are 0..4
+; Anonymize a visitor's IP address before any tracking heuristics or any plugins can access the visitor's IP address;
+; This value is the number of octets in IP address to mask; if the AnonymizeIP plugin is deactivated, this value is ignored.
+; For IPv4 addresses, valid values are 0..4; for IPv6 addresses, valid values are 0..16
+ip_address_pre_mask_length = 0
+
+; Anonymize a visitor's IP address after tracking heuristics but before storing to DB;
+; This value is the number of octets in IP address to mask; if the AnonymizeIP plugin is deactivated, this value is ignored.
+; For IPv4 addresses, valid values are 0..4; for IPv6 addresses, valid values are 0..16
ip_address_mask_length = 1
[Segments]