diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
| commit | ae3425d2dadbac69e7dcb0ba577db20e63e7d91f (patch) | |
| tree | f483759739cd951c33ef1c61ade8694f9e1c95e3 /config | |
| parent | 3329e0f2b22207a24ddb4953bbf11964b23682d9 (diff) | |
| parent | 73685892ed6f255a916512863cd5549914d071e1 (diff) | |
| download | nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.tar.gz nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.zip | |
Merge branch 'master' into securityutils
Conflicts:
lib/private/util.php
Diffstat (limited to 'config')
| -rwxr-xr-x | config/config.sample.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 02dbb1fcf75..71105a8b10d 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -65,6 +65,12 @@ $CONFIG = array( /* List of trusted domains, to prevent host header poisoning ownCloud is only using these Host headers */ 'trusted_domains' => array('demo.owncloud.org', 'otherdomain.owncloud.org:8080'), +/* List of trusted proxy servers */ +'trusted_proxies' => array('203.0.113.45', '198.51.100.128'), + +/* Headers that should be trusted as client IP address in combination with `trusted_proxies` */ +'forwarded_for_headers' => array('HTTP_X_FORWARDED', 'HTTP_FORWARDED_FOR'), + /* Theme to use for ownCloud */ "theme" => "", |