From 6775c9ed32432bd3324f7c6191d50c6de44c3d4b Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Fri, 10 Oct 2014 09:42:58 -0700 Subject: [PATCH 1/3] small corrections to config.sample.php --- config/config.sample.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 02958ace0c2..63206938988 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -40,27 +40,32 @@ $CONFIG = array( * This is a unique identifier for your ownCloud installation, created * automatically by the installer. Do not change it. */ -'instanceid' => '', +'instanceid' => 'd3c944a9a', /** * The salt used to hash all passwords, auto-generated by the ownCloud * installer. (There are also per-user salts.) If you lose this salt you lose * all your passwords. */ -'passwordsalt' => '', +'passwordsalt' => 'd3c944a9af095aa08f', /** * Your list of trusted domains that users can log into. Specifying trusted * domains prevents host header poisoning. Do not remove this, as it performs * necessary security checks. */ -'trusted_domains' => array('demo.example.org', 'otherdomain.example.org:8080'), +'trusted_domains' => + array ( + 0 => 'demo.example.org', + 1 => 'otherdomain.example.org:8080', + ), + /** * Where user files are stored; this defaults to ``data/`` in the ownCloud * directory. The SQLite database is also stored here, when you use SQLite. */ -'datadirectory' => '', +'datadirectory' => '/var/www/owncloud/data', /** * The current version number of your ownCloud installation. This is set up @@ -642,10 +647,11 @@ $CONFIG = array( */ /** - * Blacklist a specific file and disallow the upload of files with this name + * Blacklist a specific file or files and disallow the upload of files + * with this name * WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING. */ -'blacklisted_files' => array('.htaccess'), +'blacklisted_files' => array('filename1', 'filename2'), /** * Define a default folder for shared files and folders other than root. From a8a0bcaffced7ba39c5c2c539191442a9c2e55da Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Tue, 14 Oct 2014 10:00:20 -0700 Subject: [PATCH 2/3] some small tweaks --- config/config.sample.php | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 63206938988..4266e8a7172 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -5,8 +5,9 @@ * configuration options and their usage. * * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK - * YOUR INSTANCE. Instead, manually copy configurations switches that you - * consider important for your instance to your configuration. + * YOUR INSTANCE. Instead, manually copy configuration switches that you + * consider important for your instance to your working ``config.php``, and + * apply configuration options that are pertinent for your instance. * * This file is used to generate the config documentation. Please consider * following requirements of the current parser: @@ -38,14 +39,17 @@ $CONFIG = array( /** * This is a unique identifier for your ownCloud installation, created - * automatically by the installer. Do not change it. + * automatically by the installer. This example is for documentation only, + * and you should never use it because it will not work. A valid ``instanceid`` + * is created when you install ownCloud. */ 'instanceid' => 'd3c944a9a', /** * The salt used to hash all passwords, auto-generated by the ownCloud * installer. (There are also per-user salts.) If you lose this salt you lose - * all your passwords. + * all your passwords. This example is for documentation only, + * and you should never use it. */ 'passwordsalt' => 'd3c944a9af095aa08f', @@ -56,8 +60,8 @@ $CONFIG = array( */ 'trusted_domains' => array ( - 0 => 'demo.example.org', - 1 => 'otherdomain.example.org:8080', + 'demo.example.org', + 'otherdomain.example.org:8080', ), @@ -535,7 +539,12 @@ $CONFIG = array( */ /** - * TODO + * By default, ownCloud can generate previews for the following filetypes: + * Images files + * Covers of MP3 files + * Text documents + * Valid values are ``true``, to enable previews, or + * ``false``, to disable previews */ 'enable_previews' => true, /** @@ -648,10 +657,10 @@ $CONFIG = array( /** * Blacklist a specific file or files and disallow the upload of files - * with this name + * with this name. ``.htaccess`` is blocked by default. * WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING. */ -'blacklisted_files' => array('filename1', 'filename2'), +'blacklisted_files' => array('.htaccess'), /** * Define a default folder for shared files and folders other than root. From 887d6155b850340a0ad26f489445bbd1c305b393 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Tue, 14 Oct 2014 16:57:45 -0700 Subject: [PATCH 3/3] commented out instanceid and passwordsalt --- config/config.sample.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 4266e8a7172..7d0b73f0cfa 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -42,16 +42,18 @@ $CONFIG = array( * automatically by the installer. This example is for documentation only, * and you should never use it because it will not work. A valid ``instanceid`` * is created when you install ownCloud. + * + * 'instanceid' => 'd3c944a9a', */ -'instanceid' => 'd3c944a9a', -/** + /** * The salt used to hash all passwords, auto-generated by the ownCloud * installer. (There are also per-user salts.) If you lose this salt you lose * all your passwords. This example is for documentation only, * and you should never use it. + * + *'passwordsalt' => 'd3c944a9af095aa08f', */ -'passwordsalt' => 'd3c944a9af095aa08f', /** * Your list of trusted domains that users can log into. Specifying trusted