summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-13 11:18:24 +0200
committerVincent Petry <pvince81@owncloud.com>2014-10-14 09:20:23 +0200
commitba33fd6a07bf55b10366b012be8d4d4e14ac7d2a (patch)
tree5945c54a8e130cb620015f34cca20c134803cb1c /config
parentda150afcc53178f9b2834566593cce2f2772b2dc (diff)
downloadnextcloud-server-ba33fd6a07bf55b10366b012be8d4d4e14ac7d2a.tar.gz
nextcloud-server-ba33fd6a07bf55b10366b012be8d4d4e14ac7d2a.zip
Set overwritemailurl* configs on setup
Correctly use overwritemailurl value when generating absolute urls in CLI Fix #11500 Rename the config to *cli Add overwrite.cli.url to the sample config Revert separator fix, fixes unit test Backport of 0407bc097895355b90bc722e8b58afb27a40d538 from master
Diffstat (limited to 'config')
-rwxr-xr-xconfig/config.sample.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index ffbcbeaf3bf..d86d46a698d 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -330,6 +330,13 @@ $CONFIG = array(
'overwritecondaddr' => '',
/**
+ * Use this configuration parameter to specify the base url for any urls which are
+ * generated within ownCloud using any kind of command line tools (cron or occ).
+ * The value should contain the full base URL: ``https://www.example.com/owncloud``
+ */
+'overwrite.cli.url' => '',
+
+/**
* The URL of your proxy server, for example ``proxy.example.com:8081``.
*/
'proxy' => '',