summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-07-07 19:34:11 +0200
committerGitHub <noreply@github.com>2016-07-07 19:34:11 +0200
commitc8ba8f637eb04f70cde45c5051e7e78c0ab24026 (patch)
tree598d46eec148647d4d609b19a974c9b3d18d304e /config
parent2a1a3957b65e847d51c4c735acf033f7df29cba6 (diff)
parentc2309f1bcd5469e44fb5902bc62b55f439deba52 (diff)
downloadnextcloud-server-c8ba8f637eb04f70cde45c5051e7e78c0ab24026.tar.gz
nextcloud-server-c8ba8f637eb04f70cde45c5051e7e78c0ab24026.zip
Merge pull request #314 from jernst/master
Allow wildcard * to be used in trusted domains
Diffstat (limited to 'config')
-rw-r--r--config/config.sample.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 21e8e55069e..9c938eedd60 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -58,6 +58,12 @@ $CONFIG = array(
* Your list of trusted domains that users can log into. Specifying trusted
* domains prevents host header poisoning. Do not remove this, as it performs
* necessary security checks.
+ * You can specify:
+ * - the exact hostname of your host or virtual host, e.g. demo.example.org.
+ * - the exact hostname with permitted port, e.g. demo.example.org:443.
+ * This disallows all other ports on this host
+ * - use * as a wildcard, e.g. ubos-raspberry-pi*.local will allow
+ * ubos-raspberry-pi.local and ubos-raspberry-pi-2.local
*/
'trusted_domains' =>
array (