From 2cf4ae29252d1f952440230945e447cc40c9d95d Mon Sep 17 00:00:00 2001 From: Patric Lenhart Date: Thu, 23 Jun 2016 16:11:56 +0200 Subject: [PATCH 1/3] changed ownCloud to Nextcloud, updated config options --- config/config.sample.php | 299 ++++++++++++++++++++++----------------- 1 file changed, 166 insertions(+), 133 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index be3280390d3d7..502ac39dfbdc7 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -26,23 +26,23 @@ /** * Default Parameters * - * These parameters are configured by the ownCloud installer, and are required - * for your ownCloud server to operate. + * These parameters are configured by the Nextcloud installer, and are required + * for your Nextcloud server to operate. */ /** - * This is a unique identifier for your ownCloud installation, created + * This is a unique identifier for your Nextcloud installation, created * 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. + * is created when you install Nextcloud. * * 'instanceid' => 'd3c944a9a', */ 'instanceid' => '', /** - * The salt used to hash all passwords, auto-generated by the ownCloud + * The salt used to hash all passwords, auto-generated by the Nextcloud * 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. @@ -67,14 +67,13 @@ /** - * Where user files are stored; this defaults to ``data/`` in the ownCloud + * Where user files are stored; this defaults to ``data/`` in the Nextcloud * directory. The SQLite database is also stored here, when you use SQLite. - * (SQLite is not available in ownCloud Enterprise Edition) */ -'datadirectory' => '/var/www/owncloud/data', +'datadirectory' => '/var/www/nextcloud/data', /** - * The current version number of your ownCloud installation. This is set up + * The current version number of your Nextcloud installation. This is set up * during installation and update, so you shouldn't need to change it. */ 'version' => '', @@ -84,10 +83,10 @@ * ``supportedDatabases`` * * Available: - * - sqlite (SQLite3 - Not in Enterprise Edition) + * - sqlite (SQLite3) * - mysql (MySQL/MariaDB) * - pgsql (PostgreSQL) - * - oci (Oracle - Enterprise Edition Only) + * - oci (Oracle) */ 'dbtype' => 'sqlite', @@ -100,14 +99,14 @@ 'dbhost' => '', /** - * The name of the ownCloud database, which is set during installation. You + * The name of the Nextcloud database, which is set during installation. You * should not need to change this. */ -'dbname' => 'owncloud', +'dbname' => 'nextcloud', /** - * The user that ownCloud uses to write to the database. This must be unique - * across ownCloud instances using the same SQL database. This is set up during + * The user that Nextcloud uses to write to the database. This must be unique + * across Nextcloud instances using the same SQL database. This is set up during * installation, so you shouldn't need to change it. */ 'dbuser' => '', @@ -119,12 +118,12 @@ 'dbpassword' => '', /** - * Prefix for the ownCloud tables in the database. + * Prefix for the Nextcloud tables in the database. */ 'dbtableprefix' => '', /** - * Indicates whether the ownCloud instance was installed successfully; ``true`` + * Indicates whether the Nextcloud instance was installed successfully; ``true`` * indicates a successful installation, and ``false`` indicates an unsuccessful * installation. */ @@ -139,7 +138,7 @@ */ /** - * This sets the default language on your ownCloud server, using ISO_639-1 + * This sets the default language on your Nextcloud server, using ISO_639-1 * language codes such as ``en`` for English, ``de`` for German, and ``fr`` for * French. It overrides automatic language detection on public pages like login * or shared items. User's language preferences configured under "personal -> @@ -151,14 +150,14 @@ * Set the default app to open on login. Use the app names as they appear in the * URL after clicking them in the Apps menu, such as documents, calendar, and * gallery. You can use a comma-separated list of app names, so if the first - * app is not enabled for a user then ownCloud will try the second one, and so + * app is not enabled for a user then Nextcloud will try the second one, and so * on. If no enabled apps are found it defaults to the Files app. */ 'defaultapp' => 'files', /** * ``true`` enables the Help menu item in the user menu (top right of the - * ownCloud Web interface). ``false`` removes the Help item. + * Nextcloud Web interface). ``false`` removes the Help item. */ 'knowledgebaseenabled' => true, @@ -194,12 +193,19 @@ */ 'session_keepalive' => true, +/** + * Enforce token authentication for clients, which blocks requests using the user + * password for enhanced security. Users need to generate tokens in personal settings + * which can be used as passwords on their clients. + */ +'token_auth_enforced' => false, + /** * 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' => '/path/to/owncloud/core/skeleton', +'skeletondirectory' => '/path/to/nextcloud/core/skeleton', /** * The ``user_backends`` app (which needs to be enabled first) allows you to @@ -224,13 +230,13 @@ /** * Mail Parameters * - * These configure the email settings for ownCloud notifications and password + * These configure the email settings for Nextcloud notifications and password * resets. */ /** - * The return address that you want to appear on emails sent by the ownCloud - * server, for example ``oc-admin@example.com``, substituting your own domain, + * The return address that you want to appear on emails sent by the Nextcloud + * server, for example ``nc-admin@example.com``, substituting your own domain, * of course. */ 'mail_domain' => 'example.com', @@ -239,7 +245,7 @@ * FROM address that overrides the built-in ``sharing-noreply`` and * ``lostpassword-noreply`` FROM addresses. */ -'mail_from_address' => 'owncloud', +'mail_from_address' => 'nextcloud', /** * Enable SMTP class debugging. @@ -320,7 +326,7 @@ */ /** - * The automatic hostname detection of ownCloud can fail in certain reverse + * The automatic hostname detection of Nextcloud can fail in certain reverse * proxy and CLI/cron situations. This option allows you to manually override * the automatic detection; for example ``www.example.com``, or specify the port * ``www.example.com:8080``. @@ -328,20 +334,20 @@ 'overwritehost' => '', /** - * When generating URLs, ownCloud attempts to detect whether the server is - * accessed via ``https`` or ``http``. However, if ownCloud is behind a proxy - * and the proxy handles the ``https`` calls, ownCloud would not know that + * When generating URLs, Nextcloud attempts to detect whether the server is + * accessed via ``https`` or ``http``. However, if Nextcloud is behind a proxy + * and the proxy handles the ``https`` calls, Nextcloud would not know that * ``ssl`` is in use, which would result in incorrect URLs being generated. * Valid values are ``http`` and ``https``. */ 'overwriteprotocol' => '', /** - * ownCloud attempts to detect the webroot for generating URLs automatically. - * For example, if ``www.example.com/owncloud`` is the URL pointing to the - * ownCloud instance, the webroot is ``/owncloud``. When proxies are in use, it - * may be difficult for ownCloud to detect this parameter, resulting in invalid - * URLs. + * Nextcloud attempts to detect the webroot for generating URLs automatically. + * For example, if ``www.example.com/nextcloud`` is the URL pointing to the + * Nextcloud instance, the webroot is ``/nextcloud``. When proxies are in use, + * it may be difficult for Nextcloud to detect this parameter, resulting in + * invalid URLs. */ 'overwritewebroot' => '', @@ -355,9 +361,9 @@ /** * Use this configuration parameter to specify the base URL for any URLs which - * are generated within ownCloud using any kind of command line tools (cron or + * are generated within Nextcloud using any kind of command line tools (cron or * occ). The value should contain the full base URL: - * ``https://www.example.com/owncloud`` + * ``https://www.example.com/nextcloud`` */ 'overwrite.cli.url' => '', @@ -365,13 +371,13 @@ * To have clean URLs without `/index.php` this parameter needs to be configured. * * This parameter will be written as "RewriteBase" on update and installation of - * ownCloud to your `.htaccess` file. While this value is often simply the URL - * path of the ownCloud installation it cannot be set automatically properly in + * Nextcloud to your `.htaccess` file. While this value is often simply the URL + * path of the Nextcloud installation it cannot be set automatically properly in * every scenario and needs thus some manual configuration. * - * In a standard Apache setup this usually equals the folder that ownCloud is - * accessible at. So if ownCloud is accessible via "https://mycloud.org/owncloud" - * the correct value would most likely be "/owncloud". If ownCloud is running + * In a standard Apache setup this usually equals the folder that Nextcloud is + * accessible at. So if Nextcloud is accessible via "https://mycloud.org/nextcloud" + * the correct value would most likely be "/nextcloud". If Nextcloud is running * under "https://mycloud.org/" then it would be "/". * * Note that above rule is not valid in every case, there are some rare setup @@ -379,7 +385,7 @@ * configuration value is explicitly opt-in. * * After setting this value run `occ maintenance:update:htaccess` and when following - * conditions are met ownCloud uses URLs without index.php in it: + * conditions are met Nextcloud uses URLs without index.php in it: * * - `mod_rewrite` is installed * - `mod_env` is installed @@ -455,14 +461,14 @@ * Both minimum and maximum times can be set together to explicitly define * version deletion. For migration purposes, this setting is installed * initially set to "auto", which is equivalent to the default setting in - * ownCloud 8.1 and before. + * ownCloud 8.1 and before. * * Available values: * * * ``auto`` * default setting. Automatically expire versions according to expire - * rules. Please refer to Files_versions online documentation for more - * info. + * rules. Please refer to :doc:`../configuration_files/file_versioning` for + * more information. * * ``D, auto`` * keep versions at least for D days, apply expire rules to all versions * that are older than D days @@ -477,9 +483,9 @@ 'versions_retention_obligation' => 'auto', /** - * ownCloud Verifications + * Nextcloud Verifications * - * ownCloud performs several verification checks. There are two options, + * Nextcloud performs several verification checks. There are two options, * ``true`` and ``false``. */ @@ -491,7 +497,7 @@ 'appcodechecker' => true, /** - * Check if ownCloud is up-to-date and shows a notification if a new version is + * Check if Nextcloud is up-to-date and shows a notification if a new version is * available. */ 'updatechecker' => true, @@ -502,18 +508,18 @@ 'updater.server.url' => 'https://updates.nextcloud.org/server/', /** - * Is ownCloud connected to the Internet or running in a closed network? + * Is Nextcloud connected to the Internet or running in a closed network? */ 'has_internet_connection' => true, /** - * Allows ownCloud to verify a working WebDAV connection. This is done by + * Allows Nextcloud to verify a working WebDAV connection. This is done by * attempting to make a WebDAV request from PHP. */ 'check_for_working_webdav' => true, /** - * Allows ownCloud to verify a working .well-known URL redirects. This is done + * Allows Nextcloud to verify a working .well-known URL redirects. This is done * by attempting to make a request from JS to * https://your-domain.com/.well-known/caldav/ */ @@ -530,9 +536,9 @@ /** * In certain environments it is desired to have a read-only configuration file. - * When this switch is set to ``true`` ownCloud will not verify whether the + * When this switch is set to ``true`` Nextcloud will not verify whether the * configuration is writable. However, it will not be possible to configure - * all options via the Web interface. Furthermore, when updating ownCloud + * all options via the Web interface. Furthermore, when updating Nextcloud * it is required to make the configuration file writable again for the update * process. */ @@ -543,8 +549,8 @@ */ /** - * By default the ownCloud logs are sent to the ``owncloud.log`` file in the - * default ownCloud data directory. + * By default the Nextcloud logs are sent to the ``owncloud.log`` file in the + * default Nextcloud data directory. * If syslogging is desired, set this parameter to ``syslog``. * Setting this parameter to ``errorlog`` will use the PHP error_log function * for logging. @@ -552,7 +558,7 @@ 'log_type' => 'owncloud', /** - * Log file path for the ownCloud logging type. + * Log file path for the Nextcloud logging type. * Defaults to ``[datadirectory]/owncloud.log`` */ 'logfile' => '/var/log/owncloud.log', @@ -567,9 +573,9 @@ * If you maintain different instances and aggregate the logs, you may want * to distinguish between them. ``syslog_tag`` can be set per instance * with a unique id. Only available if ``log_type`` is set to ``syslog``. - * The default value is ``ownCloud``. + * The default value is ``Nextcloud``. */ -'syslog_tag' => 'ownCloud', +'syslog_tag' => 'Nextcloud', /** * Log condition for log level increase based on conditions. Once one of these @@ -614,17 +620,6 @@ */ 'cron_log' => true, -/** - * Location of the lock file for cron executions can be specified here. - * Default is within the tmp directory. The file is named in the following way: - * owncloud-server-$INSTANCEID-cron.lock - * where $INSTANCEID is the string specified in the ``instanceid`` field. - * Because the cron lock file is accessed at regular intervals, it may prevent - * enabled disk drives from spinning down. A different location for this file - * can solve such issues. - */ -'cron.lockfile.location' => '', - /** * Enables log rotation and limits the total size of logfiles. The default is 0, * or no rotation. Specify a size in bytes, for example 104857600 (100 megabytes @@ -634,36 +629,14 @@ */ 'log_rotate_size' => false, - /** - * Alternate Code Locations - * - * Some of the ownCloud code may be stored in alternate locations. - */ - -/** - * ownCloud uses some 3rd party PHP components to provide certain functionality. - * These components are shipped as part of the software package and reside in - * ``owncloud/3rdparty``. Use this option to configure a different location. - * For example, if your location is /var/www/owncloud/foo/3rdparty, then the - * correct configuration is '3rdpartyroot' => '/var/www/owncloud/foo/', - */ -'3rdpartyroot' => '', - -/** - * If you have an alternate ``3rdpartyroot``, you must also configure the URL as - * seen by a Web browser. - */ -'3rdpartyurl' => '', - -/** - * This section is for configuring the download links for ownCloud clients, as + * This section is for configuring the download links for Nextcloud clients, as * seen in the first-run wizard and on Personal pages. */ 'customclient_desktop' => - 'http://owncloud.org/sync-clients/', + 'https://nextcloud.com/install/', 'customclient_android' => - 'https://play.google.com/store/apps/details?id=com.owncloud.android', + 'https://play.google.com/store/apps/details?id=com.nextcloud.client', 'customclient_ios' => 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8', @@ -674,7 +647,7 @@ */ /** - * When enabled, admins may install apps from the ownCloud app store. + * When enabled, admins may install apps from the Nextcloud app store. */ 'appstoreenabled' => true, @@ -697,12 +670,12 @@ * which should be scanned for available apps, and where user-specific apps * should be installed from the Apps store. The ``path`` defines the absolute * file system path to the app folder. The key ``url`` defines the HTTP Web path - * to that folder, starting from the ownCloud webroot. The key ``writable`` + * to that folder, starting from the Nextcloud webroot. The key ``writable`` * indicates if a Web server can write files to that folder. */ 'apps_paths' => array( array( - 'path'=> '/var/www/owncloud/apps', + 'path'=> '/var/www/nextcloud/apps', 'url' => '/apps', 'writable' => true, ), @@ -716,13 +689,13 @@ /** * Previews * - * ownCloud supports previews of image files, the covers of MP3 files, and text + * Nextcloud supports previews of image files, the covers of MP3 files, and text * files. These options control enabling and disabling previews, and thumbnail * size. */ /** - * By default, ownCloud can generate previews for the following filetypes: + * By default, Nextcloud can generate previews for the following filetypes: * * - Image files * - Covers of MP3 files @@ -743,7 +716,7 @@ */ 'preview_max_y' => 2048, /** - * If a lot of small pictures are stored on the ownCloud instance and the + * If a lot of small pictures are stored on the Nextcloud instance and the * preview system generates blurry previews, you might want to consider setting * a maximum scale factor. By default, pictures are upscaled to 10 times the * original size. A value of ``1`` or ``null`` disables scaling. @@ -770,7 +743,7 @@ */ 'preview_office_cl_parameters' => ' --headless --nologo --nofirststartwizard --invisible --norestore '. - '-convert-to pdf -outdir ', + '--convert-to pdf --outdir ', /** * Only register providers that have been explicitly enabled @@ -869,18 +842,18 @@ */ /** - * Enable maintenance mode to disable ownCloud + * Enable maintenance mode to disable Nextcloud * - * If you want to prevent users from logging in to ownCloud before you start + * If you want to prevent users from logging in to Nextcloud before you start * doing some maintenance work, you need to set the value of the maintenance * parameter to true. Please keep in mind that users who are already logged-in - * are kicked out of ownCloud instantly. + * are kicked out of Nextcloud instantly. */ 'maintenance' => false, /** - * When set to ``true``, the ownCloud instance will be unavailable for all users - * who are not in the ``admin`` group. + * When set to ``true``, the Nextcloud instance will be unavailable for all + * users who are not in the ``admin`` group. */ 'singleuser' => false, @@ -962,6 +935,30 @@ //array('other.host.local', 11211), ), +/** + * Connection options for memcached, see http://apprize.info/php/scaling/15.html + */ +'memcached_options' => array( + // Set timeouts to 50ms + \Memcached::OPT_CONNECT_TIMEOUT => 50, + \Memcached::OPT_RETRY_TIMEOUT => 50, + \Memcached::OPT_SEND_TIMEOUT => 50, + \Memcached::OPT_RECV_TIMEOUT => 50, + \Memcached::OPT_POLL_TIMEOUT => 50, + + // Enable compression + \Memcached::OPT_COMPRESSION => true, + + // Turn on consistent hashing + \Memcached::OPT_LIBKETAMA_COMPATIBLE => true, + + // Enable Binary Protocol + \Memcached::OPT_BINARY_PROTOCOL => true, + + // Binary serializer vill be enabled if the igbinary PECL module is available + //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY, +), + /** * Location of the cache folder, defaults to ``data/$user/cache`` where @@ -972,14 +969,22 @@ 'cache_path' => '', /** - * Using Object Store with ownCloud + * TTL of chunks located in the cache folder before they're removed by + * garbage collection (in seconds). Increase this value if users have + * issues uploading very large files via the Nextcloud Client as upload isn't + * completed within one day. */ +'cache_chunk_gc_ttl' => 86400, // 60*60*24 = 1 day /** - * This example shows how to configure ownCloud to store all files in a + * Using Object Store with Nextcloud + */ + +/** + * This example shows how to configure Nextcloud to store all files in a * swift object storage. * - * It is important to note that ownCloud in object store mode will expect + * It is important to note that Nextcloud in object store mode will expect * exclusive access to the object store container because it only stores the * binary data for each file. The metadata is currently kept in the local * database for performance reasons. @@ -1001,7 +1006,7 @@ // generate a password 'password' => 'Secr3tPaSSWoRdt7', // must already exist in the objectstore, name can be different - 'container' => 'owncloud', + 'container' => 'nextcloud', // create the container if it does not exist. default is false 'autocreate' => true, // required, dev-/trystack defaults to 'RegionOne' @@ -1040,10 +1045,11 @@ /** * Additional driver options for the database connection, eg. to enable SSL - * encryption in MySQL. + * encryption in MySQL or specify a custom wait timeout on a cheap hoster. */ 'dbdriveroptions' => array( PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem', + PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800' ), /** @@ -1056,10 +1062,10 @@ * Database types that are supported for installation. * * Available: - * - sqlite (SQLite3 - Not in Enterprise Edition) + * - sqlite (SQLite3) * - mysql (MySQL) * - pgsql (PostgreSQL) - * - oci (Oracle - Enterprise Edition Only) + * - oci (Oracle) */ 'supportedDatabases' => array( 'sqlite', @@ -1069,17 +1075,17 @@ ), /** - * Override where ownCloud stores temporary files. Useful in situations where + * Override where Nextcloud stores temporary files. Useful in situations where * the system temporary directory is on a limited space ramdisk or is otherwise * restricted, or if external storages which do not support streaming are in * use. * * The Web server user must have write access to this directory. */ -'tempdirectory' => '/tmp/owncloudtemp', +'tempdirectory' => '/tmp/nextcloudtemp', /** - * The hashing cost used by hashes generated by ownCloud + * The hashing cost used by hashes generated by Nextcloud * Using a higher value requires more time and CPU power to calculate the hashes */ 'hashingCost' => 10, @@ -1097,8 +1103,8 @@ 'share_folder' => '/', /** - * If you are applying a theme to ownCloud, enter the name of the theme here. - * The default location for themes is ``owncloud/themes/``. + * If you are applying a theme to Nextcloud, enter the name of the theme here. + * The default location for themes is ``nextcloud/themes/``. */ 'theme' => '', @@ -1111,8 +1117,8 @@ /** * The minimum ownCloud desktop client version that will be allowed to sync with * this server instance. All connections made from earlier clients will be denied - * by the server. Defaults to the minimum officially supported ownCloud version at - * the time of release of this server version. + * by the server. Defaults to the minimum officially supported ownCloud desktop + * client version at the time of release of this server version. * * When changing this, note that older unsupported versions of the ownCloud desktop * client may not function as expected, and could lead to permanent data loss for @@ -1127,8 +1133,8 @@ 'quota_include_external_storage' => false, /** - * Specifies how often the local filesystem (the ownCloud data/ directory, and - * NFS mounts in data/) is checked for changes made outside ownCloud. This + * Specifies how often the local filesystem (the Nextcloud data/ directory, and + * NFS mounts in data/) is checked for changes made outside Nextcloud. This * does not apply to external storages. * * 0 -> Never check the filesystem for outside changes, provides a performance @@ -1141,7 +1147,7 @@ 'filesystem_check_changes' => 0, /** - * On default ownCloud will store the part files created during upload in the + * By default Nextcloud will store the part files created during upload in the * same storage as the upload target. Setting this to false will store the part * files in the root of the users folder which might be required to work with certain * external storage setups that have limited rename capabilities. @@ -1156,28 +1162,28 @@ /** * The parent of the directory where css and js assets will be stored if - * pipelining is enabled; this defaults to the ownCloud directory. The assets + * pipelining is enabled; this defaults to the Nextcloud directory. The assets * will be stored in a subdirectory of this directory named 'assets'. The * server *must* be configured to serve that directory as $WEBROOT/assets. - * You will only likely need to change this if the main ownCloud directory + * You will only likely need to change this if the main Nextcloud directory * is not writeable by the Web server in your configuration. */ -'assetdirectory' => '/var/www/owncloud', +'assetdirectory' => '/var/www/nextcloud', /** * Where ``mount.json`` file should be stored, defaults to ``data/mount.json`` - * in the ownCloud directory. + * in the Nextcloud directory. */ -'mount_file' => '/var/www/owncloud/data/mount.json', +'mount_file' => '/var/www/nextcloud/data/mount.json', /** - * When ``true``, prevent ownCloud from changing the cache due to changes in the - * filesystem for all storage. + * When ``true``, prevent Nextcloud from changing the cache due to changes in + * the filesystem for all storage. */ 'filesystem_cache_readonly' => false, /** - * Secret used by ownCloud for various purposes, e.g. to encrypt data. If you + * Secret used by Nextcloud for various purposes, e.g. to encrypt data. If you * lose this string there will be data corruption. */ 'secret' => '', @@ -1196,7 +1202,7 @@ * 'HTTP_X_FORWARDED_FOR' here. * * If set incorrectly, a client can spoof their IP address as visible to - * ownCloud, bypassing access controls and making logs useless! + * Nextcloud, bypassing access controls and making logs useless! * * Defaults to 'HTTP_X_FORWARED_FOR' if unset */ @@ -1224,6 +1230,15 @@ */ 'filelocking.enabled' => true, +/** + * Set the time-to-live for locks in secconds. + * + * Any lock older than this will be automatically cleaned up. + * + * If not set this defaults to either 1 hour or the php max_execution_time, whichever is higher. + */ +'filelocking.ttl' => 3600, + /** * Memory caching backend for file locking * @@ -1233,13 +1248,31 @@ 'memcache.locking' => '\\OC\\Memcache\\Redis', /** - * Set this ownCloud instance to debugging mode + * Disable the web based updater + */ +'upgrade.disable-web' => false, + +/** + * Set this Nextcloud instance to debugging mode * * Only enable this for local development and not in production environments * This will disable the minifier and outputs some additional debug information */ 'debug' => false, +/** + * Sets the data-fingerprint of the current data served + * + * This is a property used by the clients to find out if a backup has been + * restored on the server. Once a backup is restored run + * ./occ maintenance:data-fingerprint + * To set this to a new value. + * + * Updating/Deleting this value can make connected clients stall until + * the user has resolved conflicts. + */ +'data-fingerprint' => '', + /** * This entry is just here to show a warning in case somebody copied the sample * configuration. DO NOT ADD THIS SWITCH TO YOUR CONFIGURATION! From 506e739a205851641512c82e4139a7010f8fefef Mon Sep 17 00:00:00 2001 From: Patric Lenhart Date: Sun, 26 Jun 2016 15:17:38 +0200 Subject: [PATCH 2/3] removed parameter that is not relevant for stable9 --- config/config.sample.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 502ac39dfbdc7..6d29c7c734641 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1260,19 +1260,6 @@ */ 'debug' => false, -/** - * Sets the data-fingerprint of the current data served - * - * This is a property used by the clients to find out if a backup has been - * restored on the server. Once a backup is restored run - * ./occ maintenance:data-fingerprint - * To set this to a new value. - * - * Updating/Deleting this value can make connected clients stall until - * the user has resolved conflicts. - */ -'data-fingerprint' => '', - /** * This entry is just here to show a warning in case somebody copied the sample * configuration. DO NOT ADD THIS SWITCH TO YOUR CONFIGURATION! From c9898fac4a5c08a716c6503fe54527e8387f80be Mon Sep 17 00:00:00 2001 From: Patric Lenhart Date: Sun, 26 Jun 2016 23:32:40 +0200 Subject: [PATCH 3/3] removed more options that are not in stable9 --- config/config.sample.php | 53 ---------------------------------------- 1 file changed, 53 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 6d29c7c734641..e91ca40293d8b 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -193,13 +193,6 @@ */ 'session_keepalive' => true, -/** - * Enforce token authentication for clients, which blocks requests using the user - * password for enhanced security. Users need to generate tokens in personal settings - * which can be used as passwords on their clients. - */ -'token_auth_enforced' => false, - /** * 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 @@ -935,30 +928,6 @@ //array('other.host.local', 11211), ), -/** - * Connection options for memcached, see http://apprize.info/php/scaling/15.html - */ -'memcached_options' => array( - // Set timeouts to 50ms - \Memcached::OPT_CONNECT_TIMEOUT => 50, - \Memcached::OPT_RETRY_TIMEOUT => 50, - \Memcached::OPT_SEND_TIMEOUT => 50, - \Memcached::OPT_RECV_TIMEOUT => 50, - \Memcached::OPT_POLL_TIMEOUT => 50, - - // Enable compression - \Memcached::OPT_COMPRESSION => true, - - // Turn on consistent hashing - \Memcached::OPT_LIBKETAMA_COMPATIBLE => true, - - // Enable Binary Protocol - \Memcached::OPT_BINARY_PROTOCOL => true, - - // Binary serializer vill be enabled if the igbinary PECL module is available - //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY, -), - /** * Location of the cache folder, defaults to ``data/$user/cache`` where @@ -968,14 +937,6 @@ */ 'cache_path' => '', -/** - * TTL of chunks located in the cache folder before they're removed by - * garbage collection (in seconds). Increase this value if users have - * issues uploading very large files via the Nextcloud Client as upload isn't - * completed within one day. - */ -'cache_chunk_gc_ttl' => 86400, // 60*60*24 = 1 day - /** * Using Object Store with Nextcloud */ @@ -1230,15 +1191,6 @@ */ 'filelocking.enabled' => true, -/** - * Set the time-to-live for locks in secconds. - * - * Any lock older than this will be automatically cleaned up. - * - * If not set this defaults to either 1 hour or the php max_execution_time, whichever is higher. - */ -'filelocking.ttl' => 3600, - /** * Memory caching backend for file locking * @@ -1247,11 +1199,6 @@ */ 'memcache.locking' => '\\OC\\Memcache\\Redis', -/** - * Disable the web based updater - */ -'upgrade.disable-web' => false, - /** * Set this Nextcloud instance to debugging mode *