diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-13 11:18:24 +0200 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2014-10-13 17:21:33 +0200 |
commit | 48a1e69f5e803d61edcd7d083fd8e794f5bf194d (patch) | |
tree | 3477763335d51f42fbfe76fa73d5f5d31f4f2693 /config | |
parent | d71fae51f8135dc98c3377d988dfe5095884f9a4 (diff) | |
download | nextcloud-server-48a1e69f5e803d61edcd7d083fd8e794f5bf194d.tar.gz nextcloud-server-48a1e69f5e803d61edcd7d083fd8e794f5bf194d.zip |
Set overwrite.cli.url configs on setup
Correctly use overwrite.cli.url value when generating absolute urls in CLI
Fix #11500
Backport and squash of the following from master, in order:
- f0fcaff9b957f1e6c04f9bfd9b8e0eb84f78bbf8
- 923de0afd9a7e717a5e1d25747caf4840633db25
- a487ce76e86940c94801da6157bcf70ed4005c1f
- bd3ebdbd135b30946fdf55b41b5e96497d0c3e4a
Diffstat (limited to 'config')
-rwxr-xr-x | config/config.sample.php | 7 |
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' => '', |