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:
authorThomas Steur <tsteur@users.noreply.github.com>2014-07-25 10:09:28 +0400
committerThomas Steur <tsteur@users.noreply.github.com>2014-07-25 10:09:28 +0400
commit53c792c93ad56f7690c17a8abe3aeae6aad90bcf (patch)
treec305df08059960769b77b9aad6d7937de5e9ee7a /config
parent5b1fa81cba0fe54c5118a642ceacac91159f45da (diff)
parent9e5cae9504c6552900c287ae9db53d82b7329332 (diff)
Merge pull request #5872 from craue/code-cleanup-3
code cleanup
Diffstat (limited to 'config')
-rw-r--r--config/global.ini.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/config/global.ini.php b/config/global.ini.php
index 906d2fe522..76b16ca454 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -58,7 +58,6 @@ log_only_when_debug_parameter = 0
; if configured to log in a file, log entries will be made to this file
logger_file_path = tmp/logs/piwik.log
-
[Debug]
; if set to 1, the archiving process will always be triggered, even if the archive has already been computed
; this is useful when making changes to the archiving code so we can force the archiving process
@@ -247,7 +246,7 @@ session_save_handler = files
; If set to 1, Piwik will automatically redirect all http:// requests to https://
; If SSL / https is not correctly configured on the server, this will break Piwik
-; If you set this to 1, and your SSL configuration breaks later on, you can always edit this back to 0
+; If you set this to 1, and your SSL configuration breaks later on, you can always edit this back to 0
; it is recommended for security reasons to always use Piwik over https
force_ssl = 0
@@ -455,7 +454,6 @@ enable_auto_update = 1
; If set to 0 it also disables the "sent plugin update emails" feature in general and the related setting in the UI.
enable_update_communication = 1
-
[Tracker]
; Piwik uses first party cookies by default. If set to 1,
; the visit ID cookie will be set on the Piwik server domain as well
@@ -554,12 +552,11 @@ referrer_urls_spam = "semalt.com"
; DO NOT USE THIS SETTING ON PUBLICLY AVAILABLE PIWIK SERVER
; !!! Security risk: if set to 0, it would allow anyone to push data to Piwik with custom dates in the past/future and even with fake IPs!
-; When using the Tracking API, to override either the datetime and/or the visitor IP,
+; When using the Tracking API, to override either the datetime and/or the visitor IP,
; token_auth with an "admin" access is required. If you set this setting to 0, the token_auth will not be required anymore.
; DO NOT USE THIS SETTING ON PUBLIC PIWIK SERVERS
tracking_requests_require_authentication = 1
-
[Segments]
; Reports with segmentation in API requests are processed in real time.
; On high traffic websites it is recommended to pre-process the data
@@ -679,10 +676,10 @@ Plugins_Tracker[] = Login
[APISettings]
; Any key/value pair can be added in this section, they will be available via the REST call
-; index.php?module=API&method=API.getSettings
+; index.php?module=API&method=API.getSettings
; This can be used to expose values from Piwik, to control for example a Mobile app tracking
SDK_batch_size = 10
SDK_interval_value = 30
; NOTE: do not directly edit this file! See notice at the top
-
+