[Pkg-owncloud-commits] [owncloud] 15/46: small corrections to config.sample.php

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit c8c182b36eccdf6ec3df9d4658b5c7a6706fb066
Author: Carla Schroder <carla at owncloud.com>
Date:   Fri Oct 10 09:42:58 2014 -0700

    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 d86d46a..ca79f98 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
@@ -645,10 +650,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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git