summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2012-12-14 18:52:16 +0100
committerFrank Karlitschek <frank@owncloud.org>2012-12-19 18:50:19 +0100
commit019da9943a594cb2e4c727140dbd87cd103231d8 (patch)
tree6576ca6d948eda503057043066448f55422b1823 /config
parentb162e72f94b253a2e68547c8321ebb2d81dae3bc (diff)
downloadnextcloud-server-019da9943a594cb2e4c727140dbd87cd103231d8.tar.gz
nextcloud-server-019da9943a594cb2e4c727140dbd87cd103231d8.zip
add curl proxy support. Fixes #504
https://github.com/owncloud/core/issues/504
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 f531d5f146b..c915a877291 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -42,6 +42,12 @@ $CONFIG = array(
/* Time in seconds how long an user is authenticated without entering his password again before performing sensitive actions like creating or deleting users etc...*/
"enhancedauthtime" => 15 * 60,
+/* A proxy to use to connect to the internet. For example "myproxy.org:88" */
+"curlproxy" => "",
+
+/* The optional authentication for the proxy to use to connect to the internet. The format is: [username]:[password] */
+"curlproxyuserpwd" => "",
+
/* Theme to use for ownCloud */
"theme" => "",