From 6521e98926a17fa797cd97b197b7094ada4a8b52 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Mon, 21 Sep 2015 23:38:37 -0700
Subject: [PATCH] Try to fix nginx setup on travis. Includes new [tests] INI
config parameter for port (since using port 80 is not allowed for normal
users on linux).
---
config/global.ini.php | 1 +
tests/PHPUnit/bootstrap.php | 1 +
tests/PHPUnit/config.ini.travis.php | 1 +
3 files changed, 3 insertions(+)
diff --git a/config/global.ini.php b/config/global.ini.php
index 7dd55d3719..c287f21e46 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -44,6 +44,7 @@ schema = Mysql
http_host = localhost
remote_addr = "127.0.0.1"
request_uri = "@REQUEST_URI@"
+port = 80
; access key and secret as listed in AWS -> IAM -> Users
aws_accesskey = ""
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index 5eed01f806..313f8f4b6a 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -82,6 +82,7 @@ function prepareServerVariables(Config $config)
$_SERVER['HTTP_HOST'] = $testConfig['http_host'];
$_SERVER['REQUEST_URI'] = $testConfig['request_uri'];
$_SERVER['REMOTE_ADDR'] = $testConfig['remote_addr'];
+ $_SERVER['SERVER_PORT'] = $testConfig['port'];
}
function prepareTestDatabaseConfig(Config $config)
diff --git a/tests/PHPUnit/config.ini.travis.php b/tests/PHPUnit/config.ini.travis.php
index 093aeaca61..0261a631e2 100644
--- a/tests/PHPUnit/config.ini.travis.php
+++ b/tests/PHPUnit/config.ini.travis.php
@@ -14,6 +14,7 @@ tables_prefix =
[tests]
request_uri = "/"
+port = 3000
[database_tests]
host = 127.0.0.1
--
GitLab