1 files changed, 17 insertions, 3 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index f1af74da245..96565556910 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -172,6 +172,10 @@ $CONFIG = array(
 /* File for the owncloud logger to log to, (default is ownloud.log in the data dir) */
 "logfile" => "",
 
+/* This entry is just here to show a warning in case somebody copied the sample configuration. DO NOT ADD THIS SWITCH TO YOUR CONFIGURATION!  */
+/* If you, brave person, have read until here be aware that you should not modify *ANY* settings in this file without reading the documentation */
+"copied_sample_config" => true,
+
 /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
 "loglevel" => "",
 
@@ -185,9 +189,6 @@ $CONFIG = array(
  (watch out, this option can increase the size of your log file)*/
 "log_query" => false,
 
-/* Enable or disable the logging of IP addresses in case of webform auth failures */
-"log_authfailip" => false,
-
 /* Whether ownCloud should log the last successfull cron exec */
 "cron_log" => true,
 
@@ -225,6 +226,11 @@ $CONFIG = array(
  */
 // "datadirectory" => "",
 
+/* The directory where the skeleton files are located. These files will be copied to the data
+ * directory of new users. Leave empty to not copy any skeleton files.
+ */
+// "skeletondirectory" => "",
+
 /* Enable maintenance mode to disable ownCloud
    If you want to prevent users to login to ownCloud before you start doing some maintenance work,
    you need to set the value of the maintenance parameter to true.
@@ -277,6 +283,9 @@ $CONFIG = array(
 	//'config' => '/absolute/location/of/openssl.cnf',
 ),
 
+// default cipher used for file encryption, currently we support AES-128-CFB and AES-256-CFB
+'cipher' => 'AES-256-CFB',
+
 /* whether usage of the instance should be restricted to admin users only */
 'singleuser' => false,
 
@@ -336,4 +345,9 @@ $CONFIG = array(
 	),
 ),
 
+/**
+ * define default folder for shared files and folders
+ */
+'share_folder' => '/',
+
 );