summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-12 15:01:46 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-12 15:01:46 +0100
commiteac5d9fb3a52932fafdb200a2cf5d50fe9f1c759 (patch)
treeb5ebb8da406d6d667632beb4b764568c8ff954a3 /config
parent2493cfede92c472c29cffc098206b8cdb7a2ca30 (diff)
parent0d0377ebfb123e079822632ae4bc6855a11eb117 (diff)
downloadnextcloud-server-eac5d9fb3a52932fafdb200a2cf5d50fe9f1c759.tar.gz
nextcloud-server-eac5d9fb3a52932fafdb200a2cf5d50fe9f1c759.zip
Merge pull request #21336 from owncloud/system-root-certs
Allow admins to add system wide root certificates
Diffstat (limited to 'config')
-rw-r--r--config/config.sample.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 525a0895b07..b0ede5cc6de 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -854,6 +854,11 @@ $CONFIG = array(
),
/**
+ * Allow the configuration of system wide trusted certificates
+ */
+'enable_certificate_management' => false,
+
+/**
* Memory caching backend configuration
*
* Available cache backends: